stopplidelsen/innhold
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'latest' of forge.dmz.skyfritt.net:stopplidelsen/innhold into latest

Browse source 
Conflicts:
	.gitignore
This commit is contained in:
Ruben Solvang 2025-11-04 22:06:18 +00:00
commit c2833a1f06
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -1,4 +1,9 @@
app* app*
content/robots.txt content/robots.txt
<<<<<<< HEAD
custom/smtp-config.php* custom/smtp-config.php*
.htaccess* .htaccess*
=======
custom/smtp-config.php
content/.htaccess
>>>>>>> 6034ab6b59a6fed575a2b98cfb044b75a481ba0d