public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 15:15:56 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dojo-1.12.1'

Browse Source 
Conflicts:
	js/prefs.js
This commit is contained in:
Andrew Dolgov
2017-01-21 21:59:17 +03:00
parent ab235fc5f1 1c4f5e8390
commit e2e2479984
1202 changed files with 4065 additions and 1296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/prefs.js
View File

@@ -919,6 +919,7 @@ function init() {
"dojo/ready",
"dojo/parser",
"dojo/_base/loader",
"dojo/_base/html",
"dijit/ColorPalette",
"dijit/Dialog",
"dijit/form/Button",
@@ -1811,3 +1812,4 @@ function clearSqlLog() {
function updateSelectedPrompt() {
// no-op shim for toggleSelectedRow()
}