diff options
| author | Andrew Dolgov <[email protected]> | 2017-01-21 21:59:17 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2017-01-21 21:59:17 +0300 |
| commit | e2e2479984b3aaadb4c0947e5ec15276e5c9a337 (patch) | |
| tree | 1662c1772cbcb6e44d017cea28e35d45de44921f /lib/dojo-src | |
| parent | ab235fc5f13385a690a1ed31ae77d0006c85197d (diff) | |
| parent | 1c4f5e83900fdd71a84f2e142c694c75106bef53 (diff) | |
Merge branch 'dojo-1.12.1'
Conflicts:
js/prefs.js
Diffstat (limited to 'lib/dojo-src')
| -rwxr-xr-x | lib/dojo-src/rebuild-dojo.sh | 2 | ||||
| -rw-r--r-- | lib/dojo-src/tt-rss.profile.js | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/dojo-src/rebuild-dojo.sh b/lib/dojo-src/rebuild-dojo.sh index 1e33c066e..6fc2c226d 100755 --- a/lib/dojo-src/rebuild-dojo.sh +++ b/lib/dojo-src/rebuild-dojo.sh @@ -7,7 +7,7 @@ # Dojo requires Java runtime to build. Further information on rebuilding Dojo # is available here: http://dojotoolkit.org/reference-guide/build/index.html -VERSION=1.8.3 +VERSION=1.12.1 # Download and extract dojo src code if it doesn't already exist if [ ! -d "dojo" ]; then diff --git a/lib/dojo-src/tt-rss.profile.js b/lib/dojo-src/tt-rss.profile.js index 1c1e23517..7041c31cf 100644 --- a/lib/dojo-src/tt-rss.profile.js +++ b/lib/dojo-src/tt-rss.profile.js @@ -6,6 +6,7 @@ dependencies = { "dojo._base.url", "dojo.cache", "dojo.dojo", + "dojo.dom-construct", "dojo.parser", "dojo.data.ItemFileWriteStore", "dojo.selector.acme", |