]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 6 Aug 2012 17:18:00 +0000 (13:18 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 6 Aug 2012 17:18:00 +0000 (13:18 -0400)
* remotes/upstream/master:
  rev update
  Frost-mobile: media query in css for tablets
  expire issue
  rev update


Trivial merge