]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 12 Mar 2012 21:12:01 +0000 (17:12 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 12 Mar 2012 21:12:01 +0000 (17:12 -0400)
commit5a1e2c32fe4a36b1dbbaa6b224c8ced6cb3358c4
treeb394fd0565e8509575a5223222ae05ec50402b7c
parenta1305433b8110ebfa9d722ba4053f0292dadf22a
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: