]> git.mxchange.org Git - friendica.git/commit
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)
commit02f8e95b1a4b44f140b2e871097673185158d8a5
tree3d3e99fc14b5ba04aa9caa613acefb2c51c4ad3a
parente2e9050d748a5fca39ded6ca480a113ddca3a386
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  deleted readme.txt from folder diabook
  github finally working
  adjust3
  adjust2
  adjust

* master: