Merge branch 'master' into gh-pages
Conflicts: build.js converse.min.css converse.min.js docs/doctrees/environment.pickle docs/html/searchindex.js index.html
Showing
.bowerrc
0 → 100644
.travis.yml
0 → 100644
Libraries/jed.js
deleted
100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
Libraries/sjcl.js
deleted
100644 → 0
Libraries/strophe.js
deleted
100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
bower.json
0 → 100644
build.js
deleted
100644 → 0
converse-0.5.0.min.css
0 → 100644
converse-0.5.0.min.js
0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
converse.min.css
deleted
100644 → 0
converse.min.js
deleted
100644 → 0
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
javascripts/main.js
deleted
100644 → 0
... | @@ -29,6 +29,11 @@ | ... | @@ -29,6 +29,11 @@ |
"devDependencies": { | "devDependencies": { | ||
"grunt-cli": "~0.1.9", | "grunt-cli": "~0.1.9", | ||
"grunt": "~0.4.1", | "grunt": "~0.4.1", | ||
"grunt-contrib-jshint": "~0.6.0" | "grunt-contrib-jshint": "~0.6.0", | ||
"phantomjs": "~1.9.1-0", | |||
"jasmine-reporters": "~0.2.1", | |||
"bower": "~1.0.0", | |||
"grunt-contrib-requirejs": "~0.4.1", | |||
"grunt-contrib-cssmin": "~0.6.1" | |||
} | } | ||
} | } |
test_minified.html
0 → 100644
Please register or sign in to comment