diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-08-04 14:17:56 +0100 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-08-04 14:17:56 +0100 |
| commit | fe9b10ec85ec3dd3c53525a33ea5c68e184d3e53 (patch) | |
| tree | c8e39ac8e8d0a994d177d3425d8df4ed88b5e803 /spec/controllers/admin_request_controller_spec.rb | |
| parent | c9d8f483e727734a7f0afad9871df516e8c0470c (diff) | |
| parent | 2f1ba5fb364de990170d05e7dd81e8c0e2ef6e5f (diff) | |
Merge branch 'release/0.6.3' into develop
Conflicts:
locale/bs/app.po
locale/ca/app.po
locale/cs/app.po
locale/cy/app.po
locale/de/app.po
locale/es/app.po
locale/eu/app.po
locale/fr/app.po
locale/gl/app.po
locale/hu_HU/app.po
locale/id/app.po
locale/pt_BR/app.po
locale/sq/app.po
locale/sr@latin/app.po
Diffstat (limited to 'spec/controllers/admin_request_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions