]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c3f70a9) | patch
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)
commitb618715fc676fce71303816c0d49d8aad8beb0b6
treef23edf82793ede551df581a36f8bc2370770c092tree | snapshot
parentc3f70a9e56151b8594b3485cc8b12e4d26ac6773commit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* 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:
Unnamed repository; edit this file 'description' to name the repository.