Skip to content

Commit

Permalink
Merge branch '2.0' into 2.1
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	app/Application.php
#	composer.json
#	package.json
#	packages/slimkit-plus-appversion/composer.json
#	packages/slimkit-plus-around-amap/composer.json
#	packages/slimkit-plus-checkin/composer.json
#	packages/slimkit-plus-feed/composer.json
#	packages/slimkit-plus-id/composer.json
#	packages/slimkit-plus-music/composer.json
#	packages/slimkit-plus-news/composer.json
#	packages/slimkit-plus-socialite/composer.json
  • Loading branch information
medz committed Nov 7, 2018
2 parents 5434c71 + 8005619 commit 817014d
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 817014d

Please sign in to comment.