Commit daa59b0

fedoryakubovich

committed

Merge branch 'master' into develop

# Conflicts: # package-lock.json

2 parents b36618a + 879018c commit daa59b0Copy full SHA for daa59b0

1 file changed

+1

-1

lines changed

package-lock.json

1 file changed

+1

-1

lines changed

`‎package-lock.json`

+1-1

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Comments

(0)