]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b9ea33 1dfd5c4)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 3 Mar 2012 18:39:56 +0000 (13:39 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 3 Mar 2012 18:39:56 +0000 (13:39 -0500)
* remotes/upstream/master:
  fixed star/unstar
  fixed admin fixed editor

* master:


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