Skip to content

Commit

Permalink
Merge remote-tracking branch 'github/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
  • Loading branch information
JavaSaBr committed Aug 1, 2017
2 parents 3c24689 + 44c6eb8 commit 0c038fc
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# jMonkeyEngine 3 SpaceShift Editor 0.9.11 #
## License: Apache Version 2.0 ##

[![Join the chat at https://gitter.im/jME3-SpaceShift-Editor/Lobby](https://badges.gitter.im/jME3-SpaceShift-Editor/Lobby.svg)](https://gitter.im/jME3-SpaceShift-Editor/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

* [Wiki](https://bitbucket.org/JavaSabr/jme3-spaceshift-editor/wiki/Home)
* [Download](https://yadi.sk/d/UuKcJBNgqbV3a)
* [Gitter](https://gitter.im/jME3-SpaceShift-Editor/Lobby?source=orgpage)
Expand Down

0 comments on commit 0c038fc

Please sign in to comment.