]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1501-global-contacts
authorMichael Vogel <icarus@dabo.de>
Sun, 25 Jan 2015 07:44:42 +0000 (08:44 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 25 Jan 2015 07:44:42 +0000 (08:44 +0100)
commitdff2384e825c4cc38ab9f6c38db3daf6e9da1fc0
treed498f2de78ef6a3b5a9da12ca05d8dce93080dd4
parent597ef20b71ff7950262d54e0374399fae1400d61
parentc35e92b201371d1b48cb1ae56789269304faf7f4
Merge remote-tracking branch 'upstream/develop' into 1501-global-contacts