]> source.dussan.org Git - jquery-ui.git/commitdiff
projects / jquery-ui.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b611ba 74f8a0a)
Merge branch 'master' into datepicker datepicker 1865/head 1880/head
authorFelix Nagel <info@felixnagel.com>
Sat, 26 Aug 2017 11:08:14 +0000 (13:08 +0200)
committerFelix Nagel <info@felixnagel.com>
Sat, 26 Aug 2017 11:08:14 +0000 (13:08 +0200)
# Conflicts:
# ui/i18n/datepicker-pt.js

1  2 
tests/lib/bootstrap.js patch | diff1 | diff2 | blob | history

diff --cc tests/lib/bootstrap.js
Simple merge
The official jQuery user interface library: https://github.com/jquery/jquery-ui