]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d0fc81 f9f45fa)
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
Unnamed repository; edit this file 'description' to name the repository.