]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 5 Jun 2012 16:46:42 +0000 (12:46 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 5 Jun 2012 16:46:42 +0000 (12:46 -0400)
commit5bb4a5912b09f6c37e8543a6ff78949a2b5b8cd5
tree07c3066afb71d1ffaf6b3eaabaf3b42114498b54
parentc7b1b4b752de738c7e1fa124b61ab73bdaca628c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  DE: update for the strings
  quattro: added editor buttons to comments
  quattro: cleanup the less file

* master: