]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'jqueryui' into 1.0.x
authorEvan Prodromou <evan@status.net>
Wed, 16 Mar 2011 13:56:26 +0000 (09:56 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 16 Mar 2011 13:56:26 +0000 (09:56 -0400)
commit41420449f8316bd461a5136df25db46c045d0757
tree88d87079bd54c047bf0a7b69b5a415184907b2dd
parent35981343307bc84711f1445f516c8468c2e2e60c
parentafa1aa6c9b129b292b46c94936498196a4785cca
Merge branch 'jqueryui' into 1.0.x

Conflicts:
lib/action.php
lib/action.php