]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into aria
authorMichael <heluecht@pirati.ca>
Thu, 17 Oct 2019 22:08:05 +0000 (22:08 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 17 Oct 2019 22:08:05 +0000 (22:08 +0000)
commit1de3960e267a8d298348fbca18cf1be1f6a20f7a
tree1d274682f85701475d924c475c9880bdab057921
parentc5a90551ba0760dc3e52d184521fdff5b968b6d0
parent409d9df4af3eabbef587873c6c225605b0ff3b95
Merge remote-tracking branch 'upstream/develop' into aria
view/theme/frio/php/standard.php
view/theme/frio/templates/field_checkbox.tpl
view/theme/frio/templates/nav.tpl