From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 12 Mar 2012 21:12:01 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5a1e2c32fe4a36b1dbbaa6b224c8ced6cb3358c4;p=friendica.git

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

* remotes/upstream/master:
  add lightbox, fixex in css
  more save to file backend
  backend for "save to file" feature

* master:
---