]> gitweb.fluxo.info Git - padrao.git/commitdiff
Merge branch 'develop' into feature/boxes feature/boxes
authorSilvio Rhatto <rhatto@riseup.net>
Sat, 1 Aug 2015 16:52:06 +0000 (13:52 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Sat, 1 Aug 2015 16:52:06 +0000 (13:52 -0300)

Trivial merge