#2150
#2150
#2150
Merge branch 'master' of github.com:molgenis/molgenis

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
#2150
Merge branch 'master' of github.com:molgenis/molgenis

Conflicts:
	molgenis-app-omx/src/main/java/org/molgenis/omx/WebAppSecurityConfig.java
#2150
#2150
Removing unnecessary classes
#2150
Merge branch 'master' of github.com:molgenis/molgenis

Conflicts:
	molgenis-app-omx/src/main/resources/molgenis_ui.xml
Merge branch 'master' of github.com:molgenis/molgenis

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
#2150
tinymce JavaScript WYSIWYG Editor
Version: 4.0.10
#2150
Merge branch 'master' of github.com:molgenis/molgenis

Conflicts:
	molgenis-app-omx/src/main/java/org/molgenis/omx/controller/BackgroundController.java
	molgenis-app-omx/src/main/java/org/molgenis/omx/controller/ContactController.java
	molgenis-app-omx/src/main/java/org/molgenis/omx/controller/HomeController.java
	molgenis-app-omx/src/main/java/org/molgenis/omx/controller/NewsController.java
	molgenis-app-omx/src/main/java/org/molgenis/omx/controller/ReferencesController.java
Merge branch 'master' of github.com:molgenis/molgenis

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
#2150
#2150
Merge branch 'master' of github.com:molgenis/molgenis

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge pull request #890 from jjettenn/master

#2150 As Molgenis developer I want a static content plugin