mirrors/notebook
3
0
Fork 0
mirror of https://github.com/indentlabs/notebook.git synced 2025-10-26 11:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
51caaa56cc
notebook/config
History
Andrew Brown 3fd6d604fe Revert "Revert "Resolve merge with master"" 
This reverts commit 6f8ae925ba.

Conflicts:
	app/assets/stylesheets/bootplus_overrides.css.less
2015-03-13 22:46:31 -05:00
..
environments Set eager_load configs as per Rake's recommendation 2015-03-13 20:14:47 -05:00
initializers Merge resolution 2015-03-13 20:12:42 -05:00
locales Revert "Revert "Resolve merge with master"" 2015-03-13 22:46:31 -05:00
application.rb Merge resolution 2015-03-13 20:12:42 -05:00
boot.rb Merge resolution 2015-03-13 20:12:42 -05:00
database.yml Merge resolution 2015-03-13 20:12:42 -05:00
database.yml.travis Set up Travis to use a PostgreSQL database for testing 2015-03-13 20:18:49 -05:00
environment.rb Merge resolution 2015-03-13 20:12:42 -05:00
routes.rb Add all the remaining tests and code to get the site functional 2015-03-13 20:15:54 -05:00
secrets.yml Merge resolution 2015-03-13 20:12:42 -05:00