projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e0f26d 2f866fe)
Merge pull request #2161 from ddorian1/release-3.4.3-rc
authorMichael Vogel <icarus@dabo.de>
Thu, 10 Dec 2015 20:20:37 +0000 (21:20 +0100)
committerMichael Vogel <icarus@dabo.de>
Thu, 10 Dec 2015 20:20:37 +0000 (21:20 +0100)
fix path for photo and proxy


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.