]> git.mxchange.org Git - friendica.git/commit
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)
commit6ee4e4a93d76ea33b61448fe7269aedaf217e8e7
tree9ff6b6bfe2fda8bdca7e436bea4fa1d499ee68cd
parent2c15bdd99eea9fa234d0d0adb3219af171de8f60
parentabba881a0224169b3492b0bfd1e198f1a8d42188
Merge remote-tracking branch 'remotes/upstream/master'

* 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