aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2012-07-16 13:26:40 -0400
committerScott González <scott.gonzalez@gmail.com>2012-07-16 13:26:40 -0400
commitb37fec9a24a6bc62bed8770148ef87a27a0bc8d7 (patch)
tree790c1e274c5aa2f63c504477838fe721effa8a27
parent58a199370ed33e71257e863897e29c36fc593316 (diff)
parent328cccdd17f33760b0e5c0a1907655778f91704d (diff)
downloadjquery-ui-b37fec9a24a6bc62bed8770148ef87a27a0bc8d7.tar.gz
jquery-ui-b37fec9a24a6bc62bed8770148ef87a27a0bc8d7.zip
Merge branch 'manifest' of github.com:jquery/jquery-ui into manifest
Conflicts: build/widget.json
0 files changed, 0 insertions, 0 deletions