diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2013-03-01 23:41:23 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2013-03-01 23:41:23 +0100 |
| commit | fadb11253b8c3f531d70892bb5f6061dd6bdc338 (patch) | |
| tree | 108d2c90ad70e7eba668c82e070c9b8c4da4d9fd /l10n/si_LK/user_ldap.po | |
| parent | f9b454dab10b48df3c64c31ce706169f9bf703bf (diff) | |
| parent | 8e5bbace718ad0c9fd9ccb7aa699cad8c34f5eea (diff) | |
| download | nextcloud-server-fadb11253b8c3f531d70892bb5f6061dd6bdc338.tar.gz nextcloud-server-fadb11253b8c3f531d70892bb5f6061dd6bdc338.zip | |
Merge branch 'master' into fixing-bugtracker-link-master
Conflicts:
core/templates/exception.php
settings/templates/help.php
Diffstat (limited to 'l10n/si_LK/user_ldap.po')
0 files changed, 0 insertions, 0 deletions