]> source.dussan.org Git - jquery.git/commit
Resolved conflict
authorRick Waldron <waldron.rick@gmail.com>
Mon, 31 Dec 2012 18:23:26 +0000 (13:23 -0500)
committerRick Waldron <waldron.rick@gmail.com>
Mon, 31 Dec 2012 18:23:26 +0000 (13:23 -0500)
commitd50c18e61f1e498b21e64fd64f847463959061a1
tree6b93e50228ed70288541bb7a054d53e98bde7306
parentd96fa37666ddd9b24a077bfccb6a9a532daea23c
Resolved conflict
src/attributes.js
src/support.js