Matt Amos c3e2e6462f Merge remote-tracking branch 'upstream/master' into routing-ui-tweaks-2 ... Conflicts: config/locales/de.yml		2015-01-26 13:14:58 +00:00
..
assets	Merge remote-tracking branch 'upstream/master' into routing-ui-tweaks-2	2015-01-26 13:14:58 +00:00
controllers	Merge remote-tracking branch 'upstream/master' into routing-ui-tweaks-2	2015-01-26 13:14:58 +00:00
helpers	Merge branch 'rails41'	2014-07-21 08:53:44 +01:00
models	Remove some (hopefully) redundant code	2015-01-11 12:54:17 +00:00
views	Merge remote-tracking branch 'upstream/master' into routing-ui-tweaks-2	2015-01-26 13:14:58 +00:00