Devin Howard 8a74118cb1 Merge branch 'develop' into feature/realtime.video		2016-01-25 11:23:32 +08:00
..
migrate	merge develop	2016-01-22 14:59:09 +13:00
schema.rb	broken gemfile.lock and pass recent migrations	2016-01-22 16:14:35 +13:00
seeds.rb	fix user seeds	2016-01-25 11:23:10 +08:00