]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d62cb9 7ab117f)
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)
* remotes/upstream/master:
  theme screenshots

* master:


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