]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 19 Mar 2012 01:09:25 +0000 (21:09 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 19 Mar 2012 01:09:25 +0000 (21:09 -0400)
commit5e2a9c99a64dc75dd70320859b093d132e823f1f
treef28947b8a85bec2c909958f9ed5f6a0c2424c348
parent02786d6ed0811b0d63c0e466309dfda7740e2609
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  revup
  CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it)

* master: