summaryrefslogtreecommitdiff
path: root/openid-selector
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-19 18:35:11 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-19 18:35:11 +0200
commit6d9249bd58ba45a6e78b5b9e502966fb7dfd8e05 (patch)
treed36cd804fc2e5f290efc63a956879ab467da6764 /openid-selector
parentc99ca86c05238594c7f0b9f7e4beedcb035ad5e3 (diff)
parentb73b74cdb12c2100b7a9857bb96cad5f9aefb4c0 (diff)
Merge branch 'allinone-da' into allinone-multilang
Conflicts (sync submodule basewiki with HEAD of allinone, and submodules javascript and openid-selector with HEAD of master): basewiki
Diffstat (limited to 'openid-selector')
0 files changed, 0 insertions, 0 deletions