]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e2e9050)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 2 Mar 2012 17:28:28 +0000 (12:28 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 2 Mar 2012 17:28:28 +0000 (12:28 -0500)
* remotes/upstream/master:
  deleted readme.txt from folder diabook
  github finally working
  adjust3
  adjust2
  adjust

* master:


No differences found
Unnamed repository; edit this file 'description' to name the repository.