Vinnie Okada ad0ca0499a Merge branch 'master' into fix-restricted-visibility ... Conflicts: db/schema.rb		2015-03-14 10:49:11 -06:00
..
fixtures	Fix user fixtures for development	2015-03-08 17:35:49 -07:00
migrate	Merge branch 'master' into fix-restricted-visibility	2015-03-14 10:49:11 -06:00
schema.rb	Merge branch 'master' into fix-restricted-visibility	2015-03-14 10:49:11 -06:00
seeds.rb	…