]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d129e7 d340b80)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 22 Apr 2012 05:17:13 +0000 (01:17 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 22 Apr 2012 05:17:13 +0000 (01:17 -0400)
* remotes/upstream/master:
  rev update
  diabook-themes: deleted obsolete diabook-folder & minor bug-fixes

* master:


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