git.p6c8.net - jirafeau_project.git/commit

]> git.p6c8.net - jirafeau_project.git/commit

author	Blackeye <14815724-Blackstareye@users.noreply.gitlab.com>
	Mon, 19 Aug 2024 12:35:12 +0000 (12:35 +0000)
committer	Blackeye <14815724-Blackstareye@users.noreply.gitlab.com>
	Mon, 19 Aug 2024 12:35:12 +0000 (12:35 +0000)
commit	d00f70e3fa9a3a15bf4d9ba09eaa11bb8868bda7
tree	08e51fbf174b435baf7f432b45651d50e76fe36b	tree \| snapshot
parent	f7cb4752610181cc8a30485fcd4187a86ac8426d	commit \| diff
parent	5aa1e87de607c31282dec602978624de9e636cba	commit \| diff

Merge branch 'next-release' into 'f_modularization_wip_rebased'

# Conflicts:
# index.php

Fork of Jirafeau by a group of developers after mojo42 discontinued it; main repository at https://gitlab.com/jirafeau/Jirafeau