Merge branch 'develop'

nephila · Oct 17, 2015 · 26bb2e1 · 26bb2e1
2 parents 2f314d9 + 6c2ccb4
commit 26bb2e1
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 0 deletions.
diff --git a/meta_mixin/locale/ar/LC_MESSAGES/django.mo b/meta_mixin/locale/ar/LC_MESSAGES/django.mo
diff --git a/meta_mixin/locale/de/LC_MESSAGES/django.mo b/meta_mixin/locale/de/LC_MESSAGES/django.mo
diff --git a/meta_mixin/locale/en/LC_MESSAGES/django.mo b/meta_mixin/locale/en/LC_MESSAGES/django.mo
diff --git a/meta_mixin/locale/es/LC_MESSAGES/django.mo b/meta_mixin/locale/es/LC_MESSAGES/django.mo
diff --git a/meta_mixin/locale/it/LC_MESSAGES/django.mo b/meta_mixin/locale/it/LC_MESSAGES/django.mo
diff --git a/meta_mixin/locale/lt/LC_MESSAGES/django.mo b/meta_mixin/locale/lt/LC_MESSAGES/django.mo
diff --git a/meta_mixin/locale/pt_BR/LC_MESSAGES/django.mo b/meta_mixin/locale/pt_BR/LC_MESSAGES/django.mo
diff --git a/meta_mixin/locale/ru/LC_MESSAGES/django.mo b/meta_mixin/locale/ru/LC_MESSAGES/django.mo
diff --git a/meta_mixin/locale/tr/LC_MESSAGES/django.mo b/meta_mixin/locale/tr/LC_MESSAGES/django.mo