Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

Browse Source

* 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:

...

This commit is contained in:

Simon L'nu 2012-04-27 21:00:56 -04:00

parent c3f70a9e56

commit b618715fc6

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available