]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c3f70a9)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 28 Apr 2012 01:00:56 +0000 (21:00 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 28 Apr 2012 01:00:56 +0000 (21:00 -0400)
* remotes/upstream/master:
  string update
  implement contact archival
  archive contact flag
  pass zrl to dfrn_request as fallback
  rev update
  another attempt to fix lower tab behaviour on small screens, community back in tab area

* master:


No differences found
Unnamed repository; edit this file 'description' to name the repository.