]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 9 Mar 2012 01:38:54 +0000 (20:38 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 9 Mar 2012 01:38:54 +0000 (20:38 -0500)
commit8d19baadffaf38a563a3ad1052180bcb142eb564
tree7bf5b508932af73bf153b1cf026d3c0c247d7e67
parentb584b263234515a1059c8b5541bbfed9bc4bfcba
parentb86a08166cf0db891392b2877c290231a3143238
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  theme info file for testbubble
  catalan translation
  revup
  add theme diabook-blue, fix css

* master: