]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 18 Apr 2012 04:24:33 +0000 (00:24 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 18 Apr 2012 04:24:33 +0000 (00:24 -0400)
commitf087fd5581eb13a792c7f53e87cf251f153677cf
tree7e45521325667ef6ac4adac3638f6adf06957033
parent74b237d46d9472a125315e35d77bf2d0fdabaa7e
parent1b6c84d8f453ff591451e3304547b239a3d86c5b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: some css/bug-fixes
  messages.po/strings.php at 100% Esperanto
  Typo

* master: