]> git.mxchange.org Git - friendica.git/commit - mod/photos.php
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5ca2794 a25ed82)
Merge branch '2019.06-rc'
authorHypolite Petovan <hypolite@mrpetovan.com>
Sun, 23 Jun 2019 19:30:44 +0000 (15:30 -0400)
committerHypolite Petovan <hypolite@mrpetovan.com>
Sun, 23 Jun 2019 19:30:44 +0000 (15:30 -0400)
commitc1f99c70b1c7d62120723f3b142e843ba25ab338
treeec7af21fde17981236c3a6432853b8544a715db1tree | snapshot
parent5ca279478eb6dd06b698e8c050ea1315c404a454commit | diff
parenta25ed827c96e6f10dd84f5b7cb104c793c95340dcommit | diff
Merge branch '2019.06-rc'

# Conflicts:
# CHANGELOG
# VERSION
# boot.php
CHANGELOG diff1 | diff2 | blob | history
mod/display.php diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.