Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
# Conflicts:
#	build/phaser-ads.js
#	build/phaser-ads.js.map
#	build/phaser-ads.min.js
#	package.json
  • Loading branch information
ale committed Aug 7, 2018
2 parents b17327a + 8fd5622 commit 243c799
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
9 changes: 7 additions & 2 deletions build/phaser-ads.js

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

2 changes: 1 addition & 1 deletion build/phaser-ads.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions build/phaser-ads.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@orange-games/phaser-ads",
"author": "OrangeGames",
"version": "2.2.6",
"version": "2.2.7",
"description": "A Phaser plugin for providing nice ads integration in your phaser.io game",
"contributors": [
{
Expand Down

0 comments on commit 243c799

Please sign in to comment.