diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-21 16:27:43 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-21 16:27:43 -0400 |
| commit | 9f356b55c6f419468771c0f3c2450010c0242abe (patch) | |
| tree | 4cd175c7ef96380b5be82722581d63cf2f2fcb30 /js/jquery.js | |
| parent | 5dc1291b59a1079cbe9bab05d12dae06b8e4c96d (diff) | |
| parent | a645d0468b368c7c659b440f72ec80498055ac3e (diff) | |
Merge branch '0.9.x' into openidplugin
Conflicts:
actions/login.php
actions/register.php
Diffstat (limited to 'js/jquery.js')
0 files changed, 0 insertions, 0 deletions