Stella Rouzi 59ed523e73 Merge 88dcc6a92f into 9f03531708		2014-07-21 13:10:16 +00:00
..
admin	Merge 88dcc6a92f into 9f03531708	2014-07-21 13:10:16 +00:00
application	Adding and removing people	2013-07-10 16:13:53 +02:00
conference	Removed conference_date_string_helper, moved date_string to application_controller	2014-07-10 22:12:11 +05:30
conference_registration	User/Person models merge	2014-06-30 15:46:06 +03:00
devise	style fixes	2014-06-30 15:46:52 +03:00
home	Removed conference_date_string_helper, moved date_string to application_controller	2014-07-10 22:12:11 +05:30
layouts	Merge 88dcc6a92f into 9f03531708	2014-07-21 13:10:16 +00:00
proposal	User/Person models merge	2014-06-30 15:46:06 +03:00
schedule	Admin sidebar: show schedule instead of edit	2014-07-14 15:20:52 +03:00
shared	User/Person models merge	2014-06-30 15:46:06 +03:00