]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83683b5 3bb785f)
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)
* remotes/upstream/master:
  XSRF protection and PHPdoc for mod/admin.php
  XSRF protection and PHPdoc for mod/admin.php

* master:


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.