Merge remote-tracking branch 'origin/web/release-3.12.1'
commit12a55ab1062b8bb3e7377a0c7db2a67d93b4e2bd
authorintrigeri <intrigeri@boum.org>
Wed, 13 Feb 2019 15:32:00 +0000 (13 15:32 +0000)
committerintrigeri <intrigeri@boum.org>
Wed, 13 Feb 2019 15:32:00 +0000 (13 15:32 +0000)
tree60e082ecee96993c213669be6dea3aebda82300f
parentebdf3c0d13547345c4d198092799e4e2c865dd42
parent4f2e6c6ca96f6fc83955bf0446fa57ef0556f781
Merge remote-tracking branch 'origin/web/release-3.12.1'
wiki/src/contribute/calendar.mdwn