Marcel Klehr a369347d86 Merge branch 'pr/1579' into toolbar-test ... Conflicts: settings.json.template src/static/js/pad_editbar.js		2014-03-16 13:30:22 +01:00
..
express	Merge branch 'pr/1579' into toolbar-test	2014-03-16 13:30:22 +01:00
express.js	Merge branch 'pr/1756' into develop	2013-09-29 16:45:12 +02:00
i18n.js	Fix #1309 : Fix support for node v0.6	2012-12-31 15:47:42 +01:00