]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29b0e5d 50cec46)
Merge branch 'vagrant2' of https://github.com/silke/friendica into develop
authorSilke Meyer <silke@silkemeyer.net>
Wed, 6 Sep 2017 19:44:09 +0000 (21:44 +0200)
committerSilke Meyer <silke@silkemeyer.net>
Wed, 6 Sep 2017 19:44:09 +0000 (21:44 +0200)

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