Gustavo Emanuel Farias Rosa 139165e929 resolve conflicts

2022-03-21 13:48:26 -03:00

..

components

resolve conflicts

2022-03-21 13:48:26 -03:00

contexts/portals

context of portals

2022-02-24 16:08:12 -03:00

pages

resolve conflicts

2022-03-21 13:48:26 -03:00

routes

fix es list

2022-03-18 15:32:46 -03:00

styles

fix es list

2022-03-18 15:32:46 -03:00

translations

adding translations

2022-03-01 16:29:17 -03:00