Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v13.2.0 #1

Open
wants to merge 70 commits into
base: master
Choose a base branch
from
Open

v13.2.0 #1

wants to merge 70 commits into from

Conversation

ifuyun
Copy link

@ifuyun ifuyun commented Oct 13, 2017

No description provided.

makinggoodsoftware and others added 30 commits December 18, 2017 10:55
# Conflicts:
#	angular-cli/package.json
#	ngtools_webpack/package.json
#	systemjs_aot/package.json
#	webpack/package.json
#	webpack2/package.json

Merge branch 'master' into latest

Merge branch 'master' into latest

# Conflicts:
#	package.json
Merge branch 'latest' into b16.0.0

Merge branch 'latest' into b16.0.0

# Conflicts:
#	src/ag-grid-proud-to-support-plunker/index.php
#	src/images/Plunker_Cover.png
#	src/media/media.php
Merge branch 'latest' into b16.0.0

Merge branch 'latest' into b16.0.0

# Conflicts:
#	src/ag-grid-proud-to-support-plunker/index.php
#	src/images/Plunker_Cover.png
#	src/media/media.php
Merge remote-tracking branch 'origin/master' into latest

# Conflicts:
#	src/index.php
Merge remote-tracking branch 'origin/b18.0.1'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants