]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c7f3e62) | patch
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 7 May 2012 08:40:54 +0000 (04:40 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 7 May 2012 08:40:54 +0000 (04:40 -0400)
commitdbbcddf84527c7df95909c5dad2d03b26262efbc
tree0f4020d6b86c65cc317739b8e562ea50801ec277tree | snapshot
parentc7f3e626d0bb141be86a8af6ffbe40768bc23069commit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  reset permissions to forum default when adding forum delivery chain

* master:
Unnamed repository; edit this file 'description' to name the repository.