diff options
| author | a klosch <klosch@netresearch.de> | 2011-12-08 22:08:34 +0100 |
|---|---|---|
| committer | a klosch <klosch@netresearch.de> | 2011-12-08 22:08:34 +0100 |
| commit | 343edab3eb5284dd0ec236883974f16b486e6e3b (patch) | |
| tree | f626c4f3a81cdfd49a06eeb0e8fa240753288f67 /template/pages/subconf/desc_en | |
| parent | 3c87791f9b82186244639673e2e1d88d03266250 (diff) | |
| parent | 99c1918e204e721daad905e614f89a78bbc37805 (diff) | |
Merge branch 'master' of sublab.org:website
Conflicts:
template/topic/topic
Diffstat (limited to 'template/pages/subconf/desc_en')
| -rw-r--r-- | template/pages/subconf/desc_en | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/template/pages/subconf/desc_en b/template/pages/subconf/desc_en new file mode 100644 index 0000000..74ca0d4 --- /dev/null +++ b/template/pages/subconf/desc_en @@ -0,0 +1 @@ +subconf is a one day barcamp in the sublab hackerspace in leipzig. |