diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-09-20 15:06:32 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-09-20 15:06:32 +0100 |
| commit | add084ee6047d3cae72e3e445135b122d8ba2cc8 (patch) | |
| tree | f9763b73753c44562d6572035ab71b4bae2957a0 /lib/tasks/config_files.rake | |
| parent | 69103f5e83d538cd3aa9a3ea39cc5736aaec21e8 (diff) | |
| parent | aebcdc082f277b3569d1300ebeda43c503d8aec5 (diff) | |
Merge branch 'release/0.6.6'0.6.6
Conflicts:
locale/cs/app.po
locale/es/app.po
Diffstat (limited to 'lib/tasks/config_files.rake')
0 files changed, 0 insertions, 0 deletions