Merge branch 'master' into notes
authorTom Hughes <tom@compton.nu>
Sat, 2 Feb 2013 11:00:46 +0000 (11:00 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 2 Feb 2013 11:00:46 +0000 (11:00 +0000)
commit56db9ca2b7e2475cd8025630049fb4a4b824f2d9
tree487fc5098c479e6bc24de13eca7aaa05ee367f70
parent76559d3de23b3af28b6d2014d12ed48d0cfc74cd
parenta77b0e45a5aa434e867a767dd26a00c8001ee359
Merge branch 'master' into notes
app/assets/javascripts/index.js
app/assets/stylesheets/common.css.scss
app/helpers/application_helper.rb
app/views/browse/_map.html.erb
app/views/user/view.html.erb
config/locales/de.yml
config/locales/en.yml
test/functional/browse_controller_test.rb