Merge branch 'master' of https://git.sdf.org/papa/rozario
Conflicts: connect.html index.html inori.html rosary-flyer.pdf rozario.css rozario.png
This commit is contained in:
commit
0f37b27024
Conflicts: connect.html index.html inori.html rosary-flyer.pdf rozario.css rozario.png