0120f3fd62
Conflicts: core/lostpassword/index.php core/lostpassword/resetpassword.php |
||
---|---|---|
.. | ||
app.php | ||
filesync.php | ||
info.xml | ||
remote.php | ||
routes.php | ||
update.php | ||
version |
0120f3fd62
Conflicts: core/lostpassword/index.php core/lostpassword/resetpassword.php |
||
---|---|---|
.. | ||
app.php | ||
filesync.php | ||
info.xml | ||
remote.php | ||
routes.php | ||
update.php | ||
version |