Merge remote-tracking branch 'upstream/master' into routing-ui-tweaks-2
authorMatt Amos <zerebubuth@gmail.com>
Mon, 26 Jan 2015 13:14:58 +0000 (13:14 +0000)
committerMatt Amos <zerebubuth@gmail.com>
Mon, 26 Jan 2015 13:14:58 +0000 (13:14 +0000)
commitc3e2e6462f293596aef5d5de18b0a173edc046c7
tree0d8b6be0a2eebd61d60caf280ff1e24b2ddaa27d
parent24df66b718e39a37eab151aa8fb5b6050789d81e
parent9ad586f08e9da72c58e6de401ce386b00241fc6c
Merge remote-tracking branch 'upstream/master' into routing-ui-tweaks-2

Conflicts:
config/locales/de.yml
app/assets/stylesheets/common.css.scss
config/initializers/assets.rb
config/locales/de.yml