Robert Richter 6f8ae925ba Revert "Resolve merge with master" ... This reverts commit 8524963f1c12d6f4667964acc16680749dec20cf, reversing changes made to bdb208e18769be9ea95c06d54c72f86d2d6a0209.		2015-03-13 20:18:49 -05:00
..
concerns	Merge resolution	2015-03-13 20:12:42 -05:00
application_controller.rb	Revert "Resolve merge with master"	2015-03-13 20:18:49 -05:00
characters_controller.rb	Fix Character model and tests	2015-03-13 20:14:06 -05:00
equipment_controller.rb	Create equipment controller tests and update Equipment controller to use Rails 4 strong parameters	2015-03-13 20:14:46 -05:00
generator_controller.rb	fix sizing on magic appearance tab long-form content fields	2013-04-21 21:53:00 -05:00
languages_controller.rb	Created Languages controller tests, and updated Languages controller to use Rails 4 strong parameters	2015-03-13 20:14:47 -05:00
locations_controller.rb	Add all the remaining tests and code to get the site functional	2015-03-13 20:15:54 -05:00
magic_controller.rb	Add all the remaining tests and code to get the site functional	2015-03-13 20:15:54 -05:00
main_controller.rb	skeleton page for attribution	2013-12-08 14:15:30 -06:00
sessions_controller.rb	Revert "Resolve merge with master"	2015-03-13 20:18:49 -05:00
universes_controller.rb	Add all the remaining tests and code to get the site functional	2015-03-13 20:15:54 -05:00
users_controller.rb	Revert "Resolve merge with master"	2015-03-13 20:18:49 -05:00