Quincy Morgan 11b2102761 Merge branch 'master' into validation ...

# Conflicts:
#	data/core.yaml
#	dist/locales/en.json
#	modules/ui/commit_warnings.js
#	modules/ui/entity_editor.js
#	modules/util/index.js
#	modules/util/util.js
#	modules/validations/index.js
#	modules/validations/many_deletions.js
#	modules/validations/missing_tag.js

2019-01-14 10:13:56 -05:00

..

bench

Begin d3 v4 update

2016-08-21 15:19:27 -04:00

data

Fix data file tests (in both phantom and real browsers)

2018-08-23 11:11:14 -04:00

spec

Merge branch 'master' into validation

2019-01-14 10:13:56 -05:00

.eslintrc

Cleanup .eslint in spec folder

2016-07-19 12:31:02 -04:00

index.html

Merge branch 'master' into validation

2019-01-14 10:13:56 -05:00