Tom Hughes 3d7eb387a7 Merge branch 'master' into notes ... Conflicts: Gemfile.lock app/assets/stylesheets/common.css.scss app/views/browse/_map.html.erb app/views/user/view.html.erb config/locales/en.yml		2013-01-15 21:11:35 +00:00
..
fixtures	Remove the author_name field from notes	2012-12-03 14:50:54 +00:00
functional	Merge branch 'master' into notes	2013-01-15 21:11:35 +00:00
integration	Update tests for layout changes	2013-01-14 22:30:54 +00:00
performance	Update to rails 3	2011-11-14 09:42:40 +00:00
unit	Fix bogus test	2012-11-12 19:27:09 +00:00
test_helper.rb	Get all the tests passing under ruby 1.9	2012-05-27 13:51:25 +01:00