aboutsummaryrefslogtreecommitdiffstats
path: root/.htaccess
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-20 03:20:37 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-03-20 03:20:37 -0400
commit5642e9fa388bb84027a7b71a3baeef39c3aafcab (patch)
tree4a2b3979200fa9966e44bf4974e9276a20d22419 /.htaccess
parent236eaf6ed09df34e62cf487712d909cb8a3b35d1 (diff)
parent5a5aadb743e055530aa071dd3e47705a3bf5d728 (diff)
downloadvolse-hubzilla-5642e9fa388bb84027a7b71a3baeef39c3aafcab.tar.gz
volse-hubzilla-5642e9fa388bb84027a7b71a3baeef39c3aafcab.tar.bz2
volse-hubzilla-5642e9fa388bb84027a7b71a3baeef39c3aafcab.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: add IP address to failed login log message modified: include/text.php Stupid bug fixed cleanup after openid refactoring refactor openid logins/registrations modified: include/text.php deleted: images/diaspora.png deleted: images/smiley-bangheaddesk.gif deleted: images/smiley-beard.png deleted: images/smiley-shaka.gif deleted: images/smiley-whitebeard.png some openid fixes, use identity url from openid server and normalise it. support "no_smilies" ctrl + left|right cursor keys to prev/next photos add 'loggin_out' hook * master:
Diffstat (limited to '.htaccess')
0 files changed, 0 insertions, 0 deletions