diff options
| author | jessib <jessib@leap.se> | 2013-01-14 11:50:54 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-01-14 11:50:54 -0800 |
| commit | c2f232d994b3ee01ff9d50da1e4f3798df2136f3 (patch) | |
| tree | 5b7a11e9aed58357d2a38b248b965cd936de6888 /users/config/locales/en.yml | |
| parent | d81bf00ecd8bdfcddf50e4881428c917253326fe (diff) | |
| parent | ee2ea4ac8f4c6b0c3b09be6ed49e7a1faec7a9c1 (diff) | |
Merge branch 'master' into feature/show_user. Added new tests.
Conflicts:
users/test/functional/users_controller_test.rb
Diffstat (limited to 'users/config/locales/en.yml')
0 files changed, 0 insertions, 0 deletions