Eugene 92abf4b2ff Merge 22e0c1d8f8 into 05209260a4		2017-03-10 16:41:42 +00:00
..
admin	Merge 22e0c1d8f8 into 05209260a4	2017-03-10 16:41:42 +00:00
conferences	Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController'	2016-09-30 18:49:44 -04:00
proposals	Testing if I can squash this way (#1)	2017-01-09 12:27:11 -06:00
users	Testing if I can squash this way (#1)	2017-01-09 12:27:11 -06:00