]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 5 Mar 2012 03:15:28 +0000 (22:15 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 5 Mar 2012 03:15:28 +0000 (22:15 -0500)
commitb34dd1ca713128d958712366140c80e35019a489
tree22dafb537207f0351aad8cff7656595b1c4ce01a
parentefb60e603cb8a76f96f5f5ff491af7e1b46f1bf0
parentd369fcc9945f7e9635f154089d455410fe88495a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fixes in diabook
  unused replacement variable displays %1 in all html2bbcode 'code' blocks
  revup
  style.css fix

* master: