Andrew Cantino 225d73aca3 Merge branch 'master' into openshift2 ... Conflicts: bin/setup_heroku		2014-11-02 14:31:36 -08:00
..
environments	openshift setup is working	2014-10-05 01:13:47 -07:00
initializers	Merge pull request #583 from knu/highlight_new_events	2014-10-27 12:29:47 +09:00
locales	Merge branch 'knu/upgrade_devise'	2014-10-25 13:19:39 +09:00
application.rb	Merge branch 'master' into openshift2	2014-11-02 14:31:36 -08:00
boot.rb	Change deprecated File.exists? to File.exist?.	2014-10-28 10:45:27 +09:00
database.yml	openshift setup is working	2014-10-05 01:13:47 -07:00
environment.rb	initial commit	2013-03-09 22:36:12 -08:00
routes.rb	Added a concern to configure Agents via HTML forms	2014-11-02 01:23:42 +01:00
smtp.yml	moving mail config into an initializer and a config/smtp.yml file	2013-09-27 01:15:28 -04:00