Vinnie Okada ad0ca0499a Merge branch 'master' into fix-restricted-visibility ... Conflicts: db/schema.rb		2015-03-14 10:49:11 -06:00
..
_form.html.haml	Merge branch 'master' into fix-restricted-visibility	2015-03-14 10:49:11 -06:00
show.html.haml	Improve application settings and write tests	2015-01-08 09:53:35 -08:00