Connor Turland 8664cc0bd9 Merge branch 'develop' into feature/realtime.video		2016-03-14 11:11:11 +11:00
..
assets	api: revert silly js change	2016-03-12 11:15:14 +11:00
controllers	Merge branch 'develop' into feature/realtime.video	2016-03-14 10:45:16 +11:00
helpers	not a function	2016-03-14 11:03:11 +11:00
mailers	added all files	2012-09-22 22:39:12 -04:00
models	Merge branch 'develop' into feature/realtime.video	2016-03-14 10:45:16 +11:00
policies	needed a policy for tokens	2016-03-14 08:19:26 +11:00
serializers	needed a policy for tokens	2016-03-14 08:19:26 +11:00
services	rebase onto develop which now has API and pundit	2016-03-13 10:36:38 +11:00
views	Merge branch 'develop' into feature/realtime.video	2016-03-14 11:11:11 +11:00