Merge branch 'jk/two-way-merge-corner-case-fix' into maint
[gitweb.git] / gitweb / static / js /
drwxr-xr-x   parent (dest: gitweb/static; base: 4766036ecdee2d45b5a955409da5e6751c3e2f05)
-rw-r--r-- 1011 README
-rw-r--r-- 11424 adjust-timezone.js
-rw-r--r-- 19329 blame_incremental.js
-rw-r--r-- 1278 javascript-detection.js
drwxr-xr-x - lib