diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-19 20:33:22 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-19 20:33:22 +0200 |
| commit | e54d3e4d7501b7712082eb05d584a6a5157811c8 (patch) | |
| tree | 6c21cc53ee0f11e5da3803fc5ea852d21f4e0c19 | |
| parent | afcb3da2bcbd809307299c9b3a41a876d980b140 (diff) | |
| parent | 053a9b9fe879cb73dd9e91b55461c6cb7299431b (diff) | |
Merge branch '_multilang' into allinone-multilang
Conflicts (sync with submodule HEADs):
templates
| m--------- | basewiki_da | 0 | ||||
| m--------- | basewiki_nonedit | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/basewiki_da b/basewiki_da -Subproject d197120d77000d1a26ae7a2e67535445d09b370 +Subproject a9f5af6289d5b5b3b7c92fc3b958f325e36ab91 diff --git a/basewiki_nonedit b/basewiki_nonedit -Subproject da47e211683a1b709cbe06d3cacaefa7e57c1f2 +Subproject fe0ab0103ba4810ab9a4c63391107e415e2cae5 |