Skip to content

Commit

Permalink
Merge branch 'master' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
eteubert committed Oct 22, 2020
2 parents 6b12423 + 120724c commit 8c98b09
Show file tree
Hide file tree
Showing 15 changed files with 332 additions and 205 deletions.
15 changes: 12 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,24 @@
"twig/extensions": "1.5.*",
"geoip2/geoip2": "~2.0",
"piwik/device-detector": "~3.12",
"phpunit/php-timer": "~1.0",
"podlove/webvtt-parser": "^1.1",
"geertw/ip-anonymizer": "^1.1",
"dariuszp/cli-progress-bar": "^1.0",
"league/csv": "^8.2"
"league/csv": "^8.2",
"typisttech/imposter-plugin": "^0.6.0"
},
"require-dev": {
"pear/pear_exception": "1.0.*@dev",
"podlove/comment-introspection": "dev-master",
"phpunit/phpunit": "^6.5.14"
},
"extra": {
"imposter": {
"namespace": "Podlove\\Publisher\\Vendor",
"excludes": [
"podlove/webvtt-parser",
"podlove/podlove-timeline",
"dariuszp/cli-progress-bar"
]
}
}
}
Loading

0 comments on commit 8c98b09

Please sign in to comment.