]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 29 Mar 2012 16:30:13 +0000 (12:30 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 29 Mar 2012 16:30:13 +0000 (12:30 -0400)
commite7b920c273efd8c6a70b90f701bd14f5c632d38f
tree1b1aeb8b50a56774dc66ad68765f3462b91b5403
parentf2e2632810ad3ac465edcf4cf80e1dc89e995c82
parente935b3a2253e2c1078ebecb7b9784029c94fb344
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  theme file_as combobox for 2.0
  css fixes in diabook-derivates
  quattro: style pm pages
  message: remove tabs, move new message link to aside, all message with gmail-style
  quattro: tpl for "file as"

* master: