]> git.mxchange.org Git - friendica.git/commit - view/theme/frost-mobile/templates/moderated_comment.tpl
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: af4e6a3 5eaa595)
Merge remote-tracking branch 'friendica/develop' into issue/#3062
authorHypolite Petovan <mrpetovan@gmail.com>
Wed, 11 Jan 2017 22:19:59 +0000 (09:19 +1100)
committerHypolite Petovan <mrpetovan@gmail.com>
Wed, 11 Jan 2017 22:19:59 +0000 (09:19 +1100)
commitb61479ba6eb66a5d23ff997f204319bf934783e0
tree7a3dd4220615389f90a48ac193d0c8f38c38fe6ftree | snapshot
parentaf4e6a36d4145d8a0e136c3dd3c2fbed22e4ae59commit | diff
parent5eaa5951a1b19b985017b5db20f3b1abf464a1efcommit | diff
Merge remote-tracking branch 'friendica/develop' into issue/#3062

# Conflicts:
# view/theme/duepuntozero/theme.php
# view/theme/smoothly/theme.php
boot.php diff1 | diff2 | blob | history
mod/photos.php diff1 | diff2 | blob | history
view/theme/duepuntozero/theme.php diff1 | diff2 | blob | history
view/theme/smoothly/theme.php diff1 | diff2 | blob | history
view/theme/vier/theme.php diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.