]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 5 Apr 2012 03:32:16 +0000 (23:32 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 5 Apr 2012 03:32:16 +0000 (23:32 -0400)
commitafe7f09b278bca546f606a6ce54707a853cddf47
treead54ff6a49e503a0218a301ef8e362fb6e08c6ea
parentc0a18bc2fad021db026141b732b3e9a1e0ce1d71
parentd509a463452585bcbb9fccd07857871ca5c8b063
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  correct some filer dialog weirdness caused by introduction of categories
  move alert box away from nav links
  log disabled requests
  fix config storage of booleans

* master: