]> git.wh0rd.org Git - tt-rss.git/commit
Merge branch 'dojo-1.12.1'
authorAndrew Dolgov <noreply@fakecake.org>
Sat, 21 Jan 2017 18:59:17 +0000 (21:59 +0300)
committerAndrew Dolgov <noreply@fakecake.org>
Sat, 21 Jan 2017 18:59:17 +0000 (21:59 +0300)
commite2e2479984b3aaadb4c0947e5ec15276e5c9a337
tree1662c1772cbcb6e44d017cea28e35d45de44921f
parentab235fc5f13385a690a1ed31ae77d0006c85197d
parent1c4f5e83900fdd71a84f2e142c694c75106bef53
Merge branch 'dojo-1.12.1'

Conflicts:
js/prefs.js
js/prefs.js