cktricky 9cbdbf01e5 should fix conflicts

2013-11-13 12:19:33 -05:00

..

environments

I have exhausted all thoughts on how to actually get jquery file upload to work, so screw it, I am just going to make something homegrown for tomorrow

2013-07-09 13:53:00 -04:00

initializers

fixing escaping entities

2013-11-12 19:20:42 -05:00

locales

made some changes to the application controller, added a user controller, and am now about to start working on the login piece

2013-04-24 18:09:43 -04:00

application.rb

adding security misconfig text

2013-11-12 18:55:14 -05:00

boot.rb

made some changes to the application controller, added a user controller, and am now about to start working on the login piece

2013-04-24 18:09:43 -04:00

database.yml

made some changes to the application controller, added a user controller, and am now about to start working on the login piece

2013-04-24 18:09:43 -04:00

environment.rb

made some changes to the application controller, added a user controller, and am now about to start working on the login piece

2013-04-24 18:09:43 -04:00

routes.rb

should fix conflicts

2013-11-13 12:19:33 -05:00