Merge remote-tracking branch 'upstream/master' into routing-merge
authorMatt Amos <zerebubuth@gmail.com>
Mon, 10 Nov 2014 16:14:06 +0000 (16:14 +0000)
committerMatt Amos <zerebubuth@gmail.com>
Mon, 10 Nov 2014 16:14:06 +0000 (16:14 +0000)
commit0cb475cc1ad12c82ff0a36f7b9629c2288737a4f
treef41ba348fe5c2a9c0f668d2f3e906d5f491253fe
parent1f7bd08f4a8a6a626a0c1d7ed60f2dcd6a6801e8
parentf0ecc6312b74aee11725bf0aaae47614fc9f2a87
Merge remote-tracking branch 'upstream/master' into routing-merge

Conflicts:
app/assets/javascripts/index.js
config/locales/en.yml
app/assets/javascripts/index.js
app/assets/javascripts/router.js
app/assets/stylesheets/common.css.scss
config/locales/en.yml
config/routes.rb