Skip to content

Commit

Permalink
Merge branch 'manifest' of github.com:jquery/jquery-ui into manifest
Browse files Browse the repository at this point in the history 
Conflicts:
	build/widget.json
  • Loading branch information
@scottgonzalez
scottgonzalez committed Jul 16, 2012
2 parents 58a1993 + 328cccd commit b37fec9
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit b37fec9

Please sign in to comment.