Conflicts: client/src/data/languages/de.js client/src/data/languages/es.js client/src/data/languages/fr.js client/src/data/languages/gr.js |
||
---|---|---|
.. | ||
gulp | ||
src | ||
.babelrc | ||
.gitignore | ||
gulpfile.js | ||
package.json |
Conflicts: client/src/data/languages/de.js client/src/data/languages/es.js client/src/data/languages/fr.js client/src/data/languages/gr.js |
||
---|---|---|
.. | ||
gulp | ||
src | ||
.babelrc | ||
.gitignore | ||
gulpfile.js | ||
package.json |