diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2013-10-06 20:40:34 +0200 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2013-10-06 20:40:34 +0200 |
| commit | f05494e53f19d5c2c5d6fa74c4bcb19828f3e2ce (patch) | |
| tree | 1a7f67fe97196ba9d83fbc7f2e154fc3dc6a81ac /lib/scripts/editor.js | |
| parent | 13af2b2c9bce9b46a0060d4d0b896ed69ebc3755 (diff) | |
| parent | c312f2806002b060e8bd2b6e69e3749020d56fb5 (diff) | |
| download | rpg-f05494e53f19d5c2c5d6fa74c4bcb19828f3e2ce.tar.gz rpg-f05494e53f19d5c2c5d6fa74c4bcb19828f3e2ce.tar.bz2 | |
Merge remote-tracking branch 'dokutranslatefork/lang_update_351' into fixsklocalization
Conflicts:
lib/plugins/authmysql/lang/sk/settings.php
lib/plugins/authpgsql/lang/sk/settings.php
Diffstat (limited to 'lib/scripts/editor.js')
0 files changed, 0 insertions, 0 deletions