|
environments
|
Merge resolution
|
2015-03-13 20:12:42 -05:00 |
|
initializers
|
Merge resolution
|
2015-03-13 20:12:42 -05:00 |
|
locales
|
navbar collapses* and icons are back
|
2014-03-02 23:25:45 +00: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 |
|
environment.rb
|
Merge resolution
|
2015-03-13 20:12:42 -05:00 |
|
routes.rb
|
skeleton page for attribution
|
2013-12-08 14:15:30 -06:00 |
|
secrets.yml
|
Merge resolution
|
2015-03-13 20:12:42 -05:00 |
