]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: efb60e6 d369fcc)
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)
* remotes/upstream/master:
  fixes in diabook
  unused replacement variable displays %1 in all html2bbcode 'code' blocks
  revup
  style.css fix

* master:


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