fsmanuel fcc4045a4e Merge branch 'master' into feature/store-models-in-service ...

# Conflicts:
#	app/controllers/index.js
#	tests/unit/controllers/index-test.js

2018-04-15 20:23:39 +02:00

..

.gitkeep

Initial Commit from Ember CLI v2.10.0

2017-01-30 19:42:20 +08:00

contributor.js

Revert "Adjust for new naming conventions"

2018-04-15 16:35:31 +00:00

proposal.js

Merge branch 'master' into feature/store-models-in-service

2018-04-15 20:23:39 +02:00