From 89c9f1988416e97d73f94a090e302a3b00e477bf Mon Sep 17 00:00:00 2001
From: Josh Adam <josh.adam@canada.ca>
Date: Wed, 3 Aug 2016 09:36:18 -0500
Subject: [PATCH] Fixes 392

---
 CHANGELOG.md                                      | 1 +
 pom.xml                                           | 2 +-
 src/main/resources/dandelion/dandelion.properties | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b67a9c3086f..3ccede78aa4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Changes
 
 0.11.0 to 0.12.0
 ----------------
+* [UI]: Fix issue with Dandelion filters throwing `nullpointerexception`s (0.11.4)
 * [Developer]: Added `FetchMode.SELECT` to `SequenceFilePair.files` as Hibernate was including the children multiple times in the result set. (0.11.1)
 * [UI]: FastQC images were not rendering in Firefox because the request behaviour changed. (0.11.2)
 * [UI]: Fixed a permissions issue with reading NCBI submissions. (0.11.3)
diff --git a/pom.xml b/pom.xml
index ee7b396e845..2a7b08fb629 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>ca.corefacility.bioinformatics</groupId>
 	<artifactId>irida</artifactId>
 	<packaging>war</packaging>
-	<version>0.11.3</version>
+	<version>0.11.4</version>
 	<name>irida</name>
 	<url>http://www.irida.ca</url>
 
diff --git a/src/main/resources/dandelion/dandelion.properties b/src/main/resources/dandelion/dandelion.properties
index 6c55d6c9e36..e7598fd4646 100644
--- a/src/main/resources/dandelion/dandelion.properties
+++ b/src/main/resources/dandelion/dandelion.properties
@@ -5,4 +5,5 @@
 # These will be on every page
 # ===========================
 #bundle.includes=bootstrap
-asset.fixed.version.value=${project.version}
\ No newline at end of file
+asset.fixed.version.value=${project.version}
+asset.js.processing=false
\ No newline at end of file