diff options
| author | Brion Vibber <brion@pobox.com> | 2010-04-02 15:56:25 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-04-02 15:56:25 -0700 |
| commit | 2f4438fe24a99e5493469f734bf41547c8ad2ce5 (patch) | |
| tree | 71bd93323bb6d39696ea6d13d961d4395be59ee4 /plugins/UrlShortener | |
| parent | 01a03e34c8d286011c0f4301e60c103d992a449a (diff) | |
| parent | e4d934827bd7b2162e870611662549a5df759b57 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
actions/imsettings.php
lib/jabber.php
Made a quick attempt to merge the new JID validation into the XmppPlugin, have not had a chance to test that version live yet.
Should also move over the test cases.
Diffstat (limited to 'plugins/UrlShortener')
0 files changed, 0 insertions, 0 deletions