Skip to content
Snippets Groups Projects
Commit 32a80d4e authored by Vytor Calixto's avatar Vytor Calixto :space_invader:
Browse files

Merge branch 'development' into 'auth'

Conflicts:
  gulpfile.babel.js
parents 5fcee9e5 42fea162
No related branches found
No related tags found
2 merge requests!116Release v1.0.0,!30Auth
Pipeline #
Showing
with 222 additions and 171 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment