27 Jan, 2012
9 commits
-
Conflicts: app/helpers/application_helper.rb debian/changelog vendor/plugins/monkey_patches/touch/init.rb
-
Those were obtained from the `rails-2.3` branch of https://github.com/svenfuchs/rails-i18n
26 Jan, 2012
15 commits
-
…into merge-requests/105
-
…into merge-requests/100
-
This reverts commit 866d64b6ca3bf756f34f9d9e034dab22cf588658. This commit broke features/environment_name.feature :(
-
…nto merge-requests/63
-
(ActionItem2125)
-
…nto merge-requests/60 Conflicts: test/unit/application_helper_test.rb (ActionItem2125)
24 Jan, 2012
2 commits
-
(ActionItem2070)
-
(ActionItem2070)
23 Jan, 2012
4 commits
-
…into merge-requests/116
-
…nto merge-requests/93
19 Jan, 2012
4 commits
-
…into merge-requests/109
-
(ActionItem2208)
18 Jan, 2012
2 commits
-
…into merge-requests/103
-
(ActionItem2244)
17 Jan, 2012
2 commits
-
…nto merge-requests/99
-
. Also fixing some typos (ActionItem1565)
16 Jan, 2012
2 commits
-
This reverts commit 5ee0d0eebb51c4507e19adc86c9c8f1edd994a30.