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

Update and merge #691 #773

Merged
merged 8 commits into from Nov 21, 2018
Merged

Update and merge #691 #773

merged 8 commits into from Nov 21, 2018

Conversation

ST-DDT
Copy link
Member

@ST-DDT ST-DDT commented Nov 18, 2018

Updates and merges the changes from #691 without the license changes.

I couldn't update the original PR and thus had to create a new one.

parlough and others added 8 commits May 10, 2018 21:26
Conflicts:
	source/about/assets.rst
	source/about/faq.rst
	source/about/license.rst
	source/about/structure.rst
	source/contributing/implementation/pr.rst
	source/contributing/spongedocs.rst
	source/plugin/index.rst
	source/plugin/project/gradle.rst
	source/plugin/project/maven.rst
	source/plugin/workspace/idea.rst
	source/plugin/workspace/index.rst
	source/preparing/text.rst
	source/server/getting-started/jre.rst
	source/server/management/plugins.rst
	source/server/spongineer/bugreport.rst
@ST-DDT ST-DDT added the needs review The submission is ready and needs to be reviewed label Nov 18, 2018
@ST-DDT ST-DDT merged commit 41b8625 into stable Nov 21, 2018
@ST-DDT ST-DDT deleted the continue-691 branch November 21, 2018 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs review The submission is ready and needs to be reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants