]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c15bdd abba881)
Merge remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 18 Oct 2012 15:30:58 +0000 (11:30 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 18 Oct 2012 15:30:58 +0000 (11:30 -0400)
* remotes/upstream/master:
  imagick exception
  rev update
  diabook: use proper defaults in popup sidebar config
  diabook boxes: use a common hide/show form entry definition
  remove lots of duplicated code in diabook config handling


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