aboutsummaryrefslogtreecommitdiff
path: root/engine/tests
diff options
context:
space:
mode:
authorcapo <capo@riseup.net>2013-09-10 14:17:23 +0200
committercapo <capo@riseup.net>2013-09-10 14:17:23 +0200
commit2893ba1d10fb829ac7efb0c450840cb7b00d2eb2 (patch)
tree12b6cd1a902b3df546a4ad6fac726d0ce535a2c7 /engine/tests
parent7f318825787bf0648e4fab7b53c741db0f447d20 (diff)
parent84be7867eac3e0b69cca4d84c184f6e8e4d2e43b (diff)
downloadelgg-2893ba1d10fb829ac7efb0c450840cb7b00d2eb2.tar.gz
elgg-2893ba1d10fb829ac7efb0c450840cb7b00d2eb2.tar.bz2
Merge commit 'refs/merge-requests/1' of git://gitorious.org/lorea/openid_client into merge-requests/1
Conflicts: start.php change url anillosur.cc for anillosur.net and add saravea and enekenbat
Diffstat (limited to 'engine/tests')
0 files changed, 0 insertions, 0 deletions