soumaeda 26b56a5dbc 132486 resolve conflict %!s(int64=2) %!d(string=hai) anos
..
app 26b56a5dbc 132486 resolve conflict %!s(int64=2) %!d(string=hai) anos
slackbot-proxy 02bd300a85 Merge branch 'master' into dev/7.0.x %!s(int64=2) %!d(string=hai) anos