Merge pull request #304 from adissadis/develop

merge this PR to check whether the translation success pull into transifex or not
inasafe · Mar 1, 2016 · 6e5b34b · 6e5b34b
2 parents b9dcb09 + be55c34
commit 6e5b34b
Show file tree

Hide file tree

Showing 335 changed files with 68,588 additions and 42,165 deletions.
diff --git a/.tx/config b/.tx/config
diff --git a/docs/i18n/en/LC_MESSAGES/general/activities.po b/docs/i18n/en/LC_MESSAGES/general/activities.po