]> git.mxchange.org Git - friendica.git/commit
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)
commitf99d9e4d7f89ed0edb03ff07bad7c087154fc6ad
tree880edf811fbdd2c58ddc4748d95e9244c202fd9e
parent2d129e7455b6b083809a03df97f299db732d79f6
parentd340b80094cbaf33f3989422240be929741b0ff8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rev update
  diabook-themes: deleted obsolete diabook-folder & minor bug-fixes

* master: