Merge branch 'develop' of github.com:pandorafms/pandorafms into develop

pandorafms · Sep 16, 2014 · fd06798 · fd06798
2 parents 4d7144c + 1977fb1
commit fd06798
Show file tree

Hide file tree

Showing 2 changed files with 129 additions and 126 deletions.
diff --git a/pandora_console/include/languages/ja.mo b/pandora_console/include/languages/ja.mo