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
..
assets	Merge branch 'master' into notes	2013-01-15 21:11:35 +00:00
controllers	Merge branch 'master' into notes	2013-01-15 21:11:35 +00:00
helpers	Merge branch 'master' into notes	2013-01-15 21:11:35 +00:00
models	Remove the author_name field from notes	2012-12-03 14:50:54 +00:00
views	Merge branch 'master' into notes	2013-01-15 21:11:35 +00:00