]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8d19baa e25fb2b)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 9 Mar 2012 04:59:43 +0000 (23:59 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 9 Mar 2012 04:59:43 +0000 (23:59 -0500)
* remotes/upstream/master:
  removed info
  add info
  fixed star-bug
  More improved transparency for smilies
  removed dolphin file (wtf?)
  .

* master:


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