]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 22 May 2012 01:23:40 +0000 (21:23 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 22 May 2012 01:23:40 +0000 (21:23 -0400)
commit867e3b33d11a8403ce2d7eda567b8eb7ba58bda7
tree1a91309205c5659516b0a7daab0d478db82b846a
parentf570965ebe65fe7d549cafea5f5d8c04da3d986f
parent9ca3ac6e61ff57a2bc615b133a64b0a7f66b3c41
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rev update, bug 428, 429, and ability to block globaldir submissions from demo sites

* master: