]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83f0807 4133df6)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 19 May 2012 06:59:40 +0000 (02:59 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 19 May 2012 06:59:40 +0000 (02:59 -0400)
* remotes/upstream/master:
  profile change activity link bug

* master:


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