From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 18 Mar 2012 16:02:33 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8b13358ce33a1d3f88dedf2d50c650017614f418;p=friendica.git

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  replace split() by explode(); split is deprecated
  lost changes to tinymce/bbcode
  remove admin view of local directory
  bug #337, call template_unescape() only at the end of template processing
  queue optimisation - back off delivery attempts to once per hour after the first 12 hours.

* master:
---

8b13358ce33a1d3f88dedf2d50c650017614f418