]> 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 02:40:24 +0000 (22:40 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 26 Mar 2012 02:40:24 +0000 (22:40 -0400)
commit758e1b7424c8210a60df16a12f3ba3d32b433192
tree1f811fa66480bb16cbd726257dc935185b58b15b
parent3d62cb97822e0bd9e5be0c404664667cb7cb8d98
parent7ab117fd31c31cba4880cfcc63fc940531850455
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  theme screenshots

* master: