]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 27 Apr 2012 00:07:54 +0000 (20:07 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 27 Apr 2012 00:07:54 +0000 (20:07 -0400)
commit7b5bab445de31f52504454754c3c12410537fcfd
tree733a6785377d17dc8d05d5e17e724738789c5329
parent3ee998dbaf83e92dd1ceaee4d35ca942210c5e24
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: small-fix
  add link "remove account" to /mod/settings.php

* master: