ivan eff51acc90 Merge branch 'master' into os-157-disable-user-system-views ... # Conflicts: # client/src/data/languages/en.js		2017-01-21 00:34:45 -03:00
..
gulp	Max - error with spaces [skip ci]	2016-12-13 16:47:09 -03:00
src	Merge branch 'master' into os-157-disable-user-system-views	2017-01-21 00:34:45 -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	Max Red - Abstracting StatsChart, modified demo page [skip ci]	2017-01-14 01:45:21 -03:00
preprocessor.js	[Ivan Diaz] - Move folder client architecture	2016-04-17 18:43:11 -03:00