Devin Howard 8202fb38f3 Merge branch 'develop' into feature/realtime.video		2016-02-05 16:27:43 +08:00
..
environments	merge develop into rspec-tests	2016-01-07 16:04:23 +08:00
initializers	dos2unix on the whole repo	2016-02-05 11:43:15 +08:00
locales	devise locale text	2015-12-03 16:57:29 -05:00
application.rb	don't put RAILS_ENV into the .env file - chicken and egg	2016-01-07 18:47:58 +08:00
boot.rb	this enables the vagrant port forwarding	2015-12-03 16:57:23 -05:00
database.yml	dos2unix on the whole repo	2016-02-05 11:43:15 +08:00
environment.rb	renamed application to not be ISSAD, now Metamaps	2014-07-30 01:24:20 -04:00
routes.rb	great progress	2015-12-11 14:23:41 -05:00