Tyler Pickett d323c3af93 Merge branch 'allowed_service_ips' ... Conflicts: lib/casserver/server.rb spec/spec_helper.rb		2012-12-21 11:39:49 -06:00
..
config.example.yml	Merge branch 'allowed_service_ips'	2012-12-21 11:39:49 -06:00
unicorn.rb	add unicorn config	2011-03-03 06:50:47 +08:00