Merge branch 'master' into languageptbr
Conflicts: locale/locales.js
Showing
.gitignore
0 → 100644
Gruntfile.js
0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
No preview for this file type
No preview for this file type
No preview for this file type
locale/es/LC_MESSAGES/es.js
0 → 100644
{ | { | ||
"name": "Converse.js", | "name": "converse.js", | ||
"description": "Converse.js is a web based XMPP/Jabber instant messaging client", | "version": "0.5.0", | ||
"version": "0.4.1" | "description": "Browser based XMPP instant messaging client", | ||
"main": "main.js", | |||
"directories": { | |||
"doc": "docs" | |||
}, | |||
"scripts": { | |||
"test": "" | |||
}, | |||
"repository": { | |||
"type": "git", | |||
"url": "git://github.com/jcbrand/converse.js.git" | |||
}, | |||
"keywords": [ | |||
"XMPP", | |||
"Jabber", | |||
"chat", | |||
"messaging", | |||
"chatrooms", | |||
"webchat" | |||
], | |||
"author": "JC Brand", | |||
"license": "MIT", | |||
"bugs": { | |||
"url": "https://github.com/jcbrand/converse.js/issues" | |||
}, | |||
"devDependencies": { | |||
"grunt-cli": "~0.1.9", | |||
"grunt": "~0.4.1", | |||
"grunt-contrib-jshint": "~0.6.0" | |||
} | |||
} | } |
Please register or sign in to comment