diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:48:50 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:48:50 +0200 |
| commit | 00416c4072095e97f099116ccc31675e2a3c881b (patch) | |
| tree | 9cc54a88d5b57212b420625417f085d0706e4cbb /openid-selector | |
| parent | 33557b73e518e0549e3dabc9a89a2c805c2a62f1 (diff) | |
| parent | a3a014542bddda8ba54f45078232cceeadfa505b (diff) | |
Merge branch '_multilang' into multilang
Conflicts (manually resolved):
Makefile
Diffstat (limited to 'openid-selector')
| m--------- | openid-selector | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/openid-selector b/openid-selector -Subproject b4852ae1f1905a285d69947d6352b6898303324 +Subproject 517a71e93b14812d722f000ab42a6e61cb7b402 |