Skip to content

Commit

Permalink
Merge branch 'developer'
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-render committed Dec 19, 2019
2 parents e57a97a + 7dadc24 commit a8c5c61
Show file tree
Hide file tree
Showing 11 changed files with 541 additions and 311 deletions.
20 changes: 10 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,16 @@ lib/dedalo/extras/*
!lib/dedalo/extras/muvaet

# vendor ignore all except used public
vendor/*
!vendor/maxmind
!vendor/maxmind-db
!vendor/react
!vendor/symfony
!vendor/ringcentral
!vendor/geoip2
!vendor/socrata
!vendor/composer
!vendor/leafo
# vendor/*
# !vendor/maxmind
# !vendor/maxmind-db
# !vendor/react
# !vendor/symfony
# !vendor/ringcentral
# !vendor/geoip2
# !vendor/socrata
# !vendor/composer
# !vendor/leafo

# Ignore paths that contain generated content.
media/*
Expand Down
Loading

0 comments on commit a8c5c61

Please sign in to comment.