]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d90c830 08b5ede)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 8 Mar 2012 15:46:40 +0000 (10:46 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 8 Mar 2012 15:46:40 +0000 (10:46 -0500)
* remotes/upstream/master:
  add links to /profiles, add some icons to diabook/icons, fixes in css
  Update README
  reworked fix from unary for bug #323 (due to incorrect use of array_key_exists())

* master:


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