Nabin Hait 1c30523869 Fix: merge conflict		pirms 6 gadiem
.github	Update stale.yml	pirms 6 gadiem
.travis	fix(TableMultiSelect): Minor bugs (#6730)	pirms 6 gadiem
ci	add my_config patch to travis	pirms 10 gadiem
cypress	fix(TableMultiSelect): Minor bugs (#6730)	pirms 6 gadiem
frappe	Fix: merge conflict	pirms 6 gadiem
rollup	fix: Fail bench build in CI environment	pirms 6 gadiem
test_sites	fix(TableMultiSelect): Minor bugs (#6730)	pirms 6 gadiem
.eslintignore	Added files in .eslintignore, updated globals	pirms 8 gadiem
.eslintrc	Add UI tests using Cypress (#6562)	pirms 6 gadiem
.gitignore	Add UI tests using Cypress (#6562)	pirms 6 gadiem
.travis.yml	Add UI tests using Cypress (#6562)	pirms 6 gadiem
CODE_OF_CONDUCT.md	Create CODE_OF_CONDUCT.md	pirms 7 gadiem
LICENSE	Update LICENSE	pirms 7 gadiem
MANIFEST.in	Fixed manifest and website	pirms 11 gadiem
Makefile	[NEW] Makefile to clean cache without restart	pirms 7 gadiem
README.md	dummy commit	pirms 6 gadiem
attributions.md	Non Pour Accent! (#5427)	pirms 7 gadiem
bandit.yml	Postgres support for Frappe (#5919)	pirms 6 gadiem
cypress.json	Add UI tests using Cypress (#6562)	pirms 6 gadiem
hooks.md	Non Pour Accent! (#5427)	pirms 7 gadiem
node_utils.js	feat(build): Log build errors in browser console (#5932)	pirms 6 gadiem
package.json	Fix: merge conflict	pirms 6 gadiem
requirements.txt	Merge branch 'staging' into develop	pirms 6 gadiem
setup.py	removed bad code and made compatible with pip 10 (#5458)	pirms 7 gadiem
socketio.js	frappe: refactor async to realtime (#6015)	pirms 6 gadiem
yarn.lock	Fix: merge conflict	pirms 6 gadiem