]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b584b26 b86a081)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 9 Mar 2012 01:38:54 +0000 (20:38 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 9 Mar 2012 01:38:54 +0000 (20:38 -0500)
* remotes/upstream/master:
  theme info file for testbubble
  catalan translation
  revup
  add theme diabook-blue, fix css

* master:


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