Skip to content

Commit

Permalink
Merge branch 'master' into feat/spm
Browse files Browse the repository at this point in the history
# Conflicts:
#	demo/angular/ios/App/App.xcodeproj/project.pbxproj
#	demo/angular/ios/App/App.xcodeproj/project.xcworkspace/contents.xcworkspacedata
#	demo/angular/ios/App/Podfile
#	demo/angular/ios/App/Podfile.lock
  • Loading branch information
rdlabo committed Nov 27, 2024
2 parents de6bfef + ed0b707 commit a032e7b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@capacitor-community/admob",
"version": "6.0.0",
"version": "6.1.0",
"description": "A native plugin for AdMob",
"main": "dist/plugin.cjs.js",
"module": "dist/esm/index.js",
Expand Down

0 comments on commit a032e7b

Please sign in to comment.