Luke Barratt f50c209702 Merge remote-tracking branch 'jamal/self-captains' into develop ... Conflicts: app/views/gathers/_status.html.erb		2014-10-11 23:13:57 +01:00
..
assets	Add state to gatherers and track when a gatherer has left or is away	2014-10-10 20:50:17 -04:00
controllers	Change Gather style to volunteer captains	2014-10-11 15:50:06 -04:00
helpers	Change Gather style to volunteer captains	2014-10-11 15:50:06 -04:00
mailers	Purged git history and removed sensitive information.	2014-03-23 00:22:25 +00:00
models	Change Gather style to volunteer captains	2014-10-11 15:50:06 -04:00
services	Added 2 hour start date overlap for calendar events	2014-04-04 23:56:22 +01:00
uploaders	Removed unused rails plugins & code/comments	2014-03-24 14:23:08 +00:00
views	Merge remote-tracking branch 'jamal/self-captains' into develop	2014-10-11 23:13:57 +01:00