]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 27 Mar 2012 04:54:47 +0000 (00:54 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 27 Mar 2012 04:54:47 +0000 (00:54 -0400)
commitcfdb2979cb5caac7806d993f63844c1314e2cdfa
treeee48bbc5adbf3a91d4303e7f2ee261b21ed9c5c3
parentdaa036e34c6db5db34fa2f45235ffbdc0f03a252
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  @-completion bug
  qcomment enhancements
  theme description with preview (non-translatable unfortunately)
  preparation for some possibly killer features
  translate br with extra elements
  revup
  Fixed regions for Germany, Bulgaria, Republic of Ireland, Scotland, Northern Ireland, Spain, and the UK.

* master: