Merge remote-tracking branch 'origin/master' into web/15968-donation-banner
commite8ce940e25e83ada8757cbab5229526876d6b269
authorsajolida <sajolida@pimienta.org>
Mon, 8 Oct 2018 23:52:04 +0000 (8 23:52 +0000)
committersajolida <sajolida@pimienta.org>
Mon, 8 Oct 2018 23:52:04 +0000 (8 23:52 +0000)
tree1a98b05ef6602119cc9660409ff5df0d0dd3bdd6
parentc046d8177e2c51c965a129ad076b46496782bc31
parent49479c8002907a3ec2a69d33bcc850e28c73c13c
Merge remote-tracking branch 'origin/master' into web/15968-donation-banner