Merge branch 'master' into notes
authorTom Hughes <tom@compton.nu>
Tue, 20 Nov 2012 19:08:30 +0000 (19:08 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 20 Nov 2012 19:08:30 +0000 (19:08 +0000)
commit7599f98957334d1924550205f7ba12a726de7eb0
tree2aabb3e82a15f93ed3e0fa6046addbd38f810f03
parent9f560df39d21a82b7c34e203c555da7fab01a3ae
parentbd8713f42b4a5196cf89e8270c57322742ba1f5e
Merge branch 'master' into notes

Conflicts:
Gemfile
Gemfile.lock
app/assets/stylesheets/common.css.scss
app/helpers/application_helper.rb
12 files changed:
Gemfile
Gemfile.lock
app/assets/javascripts/osm.js.erb
app/assets/stylesheets/common.css.scss
app/helpers/application_helper.rb
app/models/notifier.rb
app/models/user.rb
app/views/site/index.html.erb
config/example.application.yml
config/locales/de.yml
config/locales/en.yml
db/structure.sql