]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 20 Apr 2012 09:52:08 +0000 (05:52 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 20 Apr 2012 09:52:08 +0000 (05:52 -0400)
commit1c88a7ef5ded0a5e58a554482d2c1fbeb78c2ef0
treea5646997bfa930bc7e15db200b5de4e2eacc44b1
parent83683b516ec058d0e5fdd0d4a1defbd22a60c322
parent3bb785fdad0b1636ac5094a051e291b0f33e0f45
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  XSRF protection and PHPdoc for mod/admin.php
  XSRF protection and PHPdoc for mod/admin.php

* master: