diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2010-07-14 16:45:54 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2010-07-14 16:45:54 -0400 |
| commit | 6b36499c71991eb6a5a3aab14d2401e1e9ca2f2c (patch) | |
| tree | 244ff1c7e0f338cd6233b078f29af05d7efadce5 /tests/unit/dialog/dialog_defaults.js | |
| parent | 96e78a2cb7968fead62cfebd7640d3b96246f8dd (diff) | |
| parent | 83910b6bd3db241b1f7dc6fbfa070954be989bc7 (diff) | |
| download | jquery-ui-6b36499c71991eb6a5a3aab14d2401e1e9ca2f2c.tar.gz jquery-ui-6b36499c71991eb6a5a3aab14d2401e1e9ca2f2c.zip | |
Merge branch 'master' of github.com:jquery/jquery-ui
Conflicts:
tests/unit/dialog/dialog_defaults.js
Diffstat (limited to 'tests/unit/dialog/dialog_defaults.js')
0 files changed, 0 insertions, 0 deletions