2bfad189e7
Conflicts: lib/base.php lib/filestorage.php |
||
---|---|---|
.. | ||
appinfo | ||
templates | ||
class.openid.v3.php | ||
phpmyid.php | ||
settings.php | ||
user.php | ||
user_openid.php |
2bfad189e7
Conflicts: lib/base.php lib/filestorage.php |
||
---|---|---|
.. | ||
appinfo | ||
templates | ||
class.openid.v3.php | ||
phpmyid.php | ||
settings.php | ||
user.php | ||
user_openid.php |