]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7b34fdc 2c509ac)
Merge remote-tracking branch 'origin/doubled_code_for_scaling-dimensions' into double...
authorMarek Bachmann <marek.bachmann@comtec.eecs.uni-kassel.de>
Wed, 28 Dec 2022 15:43:47 +0000 (16:43 +0100)
committerMarek Bachmann <marek.bachmann@comtec.eecs.uni-kassel.de>
Wed, 28 Dec 2022 15:43:47 +0000 (16:43 +0100)
commiteb87a2afbec4ffbd7a7462352d2f926184ba7c63
treebc67a65945bd600f45714637ec0f981bbe3be448tree | snapshot
parent7b34fdc7152c75caa8f09ffc3569c55fc7e05598commit | diff
parent2c509ac2b297e85560e86bb8a05e8034a9246db2commit | diff
Merge remote-tracking branch 'origin/doubled_code_for_scaling-dimensions' into doubled_code_for_scaling-dimensions

# Conflicts:
# src/Object/Image.php
src/Object/Image.php diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.