ivan 6f58c28af5 Merge branch 'master' into OS-129-maintenancemode ... # Conflicts: # client/src/data/languages/en.js		2016-12-27 18:41:53 -03:00
..
gulp	Max - error with spaces [skip ci]	2016-12-13 16:47:09 -03:00
src	Merge branch 'master' into OS-129-maintenancemode	2016-12-27 18:41:53 -03:00
.babelrc	Ivan - Fix babel parser for test and make tests run [skip ci]	2016-08-10 23:42:57 -03:00
.gitignore	[Ivan Diaz] - Move folder client architecture	2016-04-17 18:43:11 -03:00
gulpfile.js	[Ivan Diaz] - Move folder client architecture	2016-04-17 18:43:11 -03:00
package.json	Merged in dropdown-accesibility (pull request #48)	2016-09-19 14:22:35 -03:00
preprocessor.js	[Ivan Diaz] - Move folder client architecture	2016-04-17 18:43:11 -03:00