]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 26 Mar 2012 07:38:19 +0000 (03:38 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 26 Mar 2012 07:38:19 +0000 (03:38 -0400)
commit7fad65d7af43414d744f4d5d1e75c0f181de9cf8
tree625babd1e9a33a34dec369cf732b150b5550e9d2
parentc4c69959e21f1053224166c65b80a7dcdc2357ad
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  add screenshots to diabook

* master: