notebook/config
Andrew Brown e14f980532 Merge branch 'master' into fix-bootplus
Conflicts:
	Gemfile.lock
2014-08-02 04:53:55 +00:00
..
environments Squashed commit of the following: 2014-01-07 22:48:06 +00:00
initializers Squashed commit of the following: 2014-01-07 22:48:06 +00:00
locales navbar collapses* and icons are back 2014-03-02 23:25:45 +00:00
application.rb mongo db config stuff 2012-12-22 17:47:13 -06:00
boot.rb rails app 2012-12-22 17:39:34 -06:00
environment.rb rails app 2012-12-22 17:39:34 -06:00
mongoid.yml Make factories and tests work 2014-03-19 00:33:32 -05:00
routes.rb skeleton page for attribution 2013-12-08 14:15:30 -06:00