diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-10-27 11:58:02 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-10-27 11:58:02 +0200 |
| commit | 0120f3fd629e772d9a7493e5289c1d6708ba92d5 (patch) | |
| tree | dbee6eba6d11afe887a6235375119b7a6bd71b69 /lib/l10n/id.php | |
| parent | 74665faec533430be37879bfc0ef24aa7f211f6e (diff) | |
| parent | beaaf5425dc2dfb7456efa934fa8eb91ac28c677 (diff) | |
| download | nextcloud-server-0120f3fd629e772d9a7493e5289c1d6708ba92d5.tar.gz nextcloud-server-0120f3fd629e772d9a7493e5289c1d6708ba92d5.zip | |
Merge branch 'routing'
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
Diffstat (limited to 'lib/l10n/id.php')
0 files changed, 0 insertions, 0 deletions