]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f570965 9ca3ac6)
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)
* remotes/upstream/master:
  rev update, bug 428, 429, and ability to block globaldir submissions from demo sites

* master:


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