ivan 86543cd818 Merge branch 'master' into improve-text-editing ... # Conflicts: # client/src/core-components/text-editor.js		2016-09-13 22:04:30 -03:00
..
gulp	Ivan - Backend - Fixes to make frontend work with API [skip ci]	2016-09-09 02:24:12 -03:00
src	Merge branch 'master' into improve-text-editing	2016-09-13 22:04:30 -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	Ivan - Frontend - Add react-rte editor support [skip ci]	2016-09-13 19:27:22 -03:00
preprocessor.js	[Ivan Diaz] - Move folder client architecture	2016-04-17 18:43:11 -03:00