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

Browse source

* remotes/upstream/master:
  fix view contacts

* master:

...

This commit is contained in:

Simon L'nu 2012-04-27 04:15:27 -04:00

parent 153534bc70

commit 014e832db0

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 is not available