Merge remote-tracking branch 'origin/develop'

Conflicts:
	app/assets/javascripts/srp
	test/nagios/soledad_sync.py
	test/nagios/webapp_login.py

1 files changed, 0 insertions, 12 deletions

diff --git a/help/app/designs/ticket/by_includes_post_by_and_updated_at.js b/help/app/designs/ticket/by_includes_post_by_and_updated_at.js
deleted file mode 100644
index 2b4304f..0000000
--- a/help/app/designs/ticket/by_includes_post_by_and_updated_at.js
+++ /dev/null
@@ -1,12 +0,0 @@
-function(doc) {
-  var arr = {}
-  if (doc['type'] == 'Ticket' && doc.comments) {
-    doc.comments.forEach(function(comment){
-      if (comment.posted_by && !arr[comment.posted_by]) {
-        //don't add duplicates
-        arr[comment.posted_by] = true;
-        emit([comment.posted_by, doc.updated_at], 1);
-      }
-    });
-  }
-}