]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f2e2632 e935b3a)
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)
* 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:


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.