From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 21 Jan 2017 18:59:17 +0000 (+0300)
Subject: Merge branch 'dojo-1.12.1'
X-Git-Tag: 17.1~14
X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=commitdiff_plain;h=e2e2479984b3aaadb4c0947e5ec15276e5c9a337

Merge branch 'dojo-1.12.1'

Conflicts:
	js/prefs.js
---

e2e2479984b3aaadb4c0947e5ec15276e5c9a337
diff --cc js/prefs.js
index 628e66a1,7db46ecd..69e779d4
--- a/js/prefs.js
+++ b/js/prefs.js
@@@ -1808,6 -1809,3 +1809,7 @@@ function clearSqlLog() 
  	}
  }
  
 +function updateSelectedPrompt() {
 +	// no-op shim for toggleSelectedRow()
 +}
++