]> git.mxchange.org Git - friendica.git/commit
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)
commitda78d8594f79792f2c144cdb5b76b561ec03b278
treed2986a36db224e06754f43ad8c52c2518b65ccd5
parent2b9ea33e8b2f774d7c4da5175e167470f1070282
parent1dfd5c4f85f2e0407f006ca962dc3dd62b092aba
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fixed star/unstar
  fixed admin fixed editor

* master: