diff options
| author | kondou <kondou@ts.unde.re> | 2013-09-02 07:58:06 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-09-02 07:58:06 +0200 |
| commit | e5fc7b9dbeb01ac116bb132903c562c8f7d3c5b3 (patch) | |
| tree | b7d8d913cdf7f4d1ce42f3027918ad0f5fbe5c3b /core/lostpassword | |
| parent | 8dd93c8c0288a11f04816bea2a58aee661ef9e97 (diff) | |
| parent | f038cb9aea7c9a1513ab14d0df002773b17d5333 (diff) | |
| download | nextcloud-server-e5fc7b9dbeb01ac116bb132903c562c8f7d3c5b3.tar.gz nextcloud-server-e5fc7b9dbeb01ac116bb132903c562c8f7d3c5b3.zip | |
Merge branch 'master' into clean_up_util
Conflicts:
lib/base.php
Diffstat (limited to 'core/lostpassword')
0 files changed, 0 insertions, 0 deletions