diff options
author | Jonas Smedegaard <dr@jones.dk> | 2010-07-21 00:12:49 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-21 00:12:49 +0200 |
commit | b5e123173781671e2b56755e97c7e4278f7a7373 (patch) | |
tree | dee2ca85d45ef078b62628daedbf3355f678a060 /openid-selector | |
parent | a7946b67cb56f934c79923f2475589535013f529 (diff) | |
parent | ac46361df071b993125f1c2e89e446cce8026549 (diff) |
Merge branch 'allinone-da' into allinone-multilang
Conflicts (suppress changes):
templates
templates_nonedit
Diffstat (limited to 'openid-selector')
0 files changed, 0 insertions, 0 deletions