...
Merge branch 'master' of github.com:edse/cmais-frontend

# By Joseval
# Via Joseval
* 'master' of github.com:edse/cmais-frontend:
  content
...
Merge branch 'master' of github.com:edse/cmais-frontend

# By georgiacatarina
# Via georgiacatarina
* 'master' of github.com:edse/cmais-frontend:
  small na tv
  internas na tv
  na tv small
  medium na tv
  autoplay cultura brasil
...
Merge branch 'master' of github.com:edse/cmais-frontend

# By georgiacatarina (2) and Joseval (1)
# Via georgiacatarina (2) and Joseval (1)
* 'master' of github.com:edse/cmais-frontend:
  box individual horario respiro
  na tv internas css margin box horarios
  Encoding