]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 939c8d3 09ed17d)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 18 Mar 2012 16:02:33 +0000 (12:02 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 18 Mar 2012 16:02:33 +0000 (12:02 -0400)
* 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:


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