]> git.mxchange.org Git - friendica.git/commitdiff
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)
* remotes/upstream/master:
  DE: update for the strings
  quattro: added editor buttons to comments
  quattro: cleanup the less file

* master:


No differences found