Connor Turland 5317711b57 Merge branch 'develop' into oauth.provider		2016-03-23 18:00:59 -07:00
..
environments	merge develop into rspec-tests	2016-01-07 16:04:23 +08:00
initializers	Merge branch 'develop' into oauth.provider	2016-03-23 18:00:59 -07:00
locales	make metamaps an oauth provider	2016-03-19 13:28:55 +11:00
application.rb	Merge branch 'develop' into feature/realtime.video	2016-03-14 10:45:16 +11: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	Merge branch 'develop' into oauth.provider	2016-03-23 18:00:59 -07:00