Commits · patch-1 · glow / chaostreffbern_website

22 Nov, 2017 2 commits
- Update stammtisch_makerspace · 47bb3b85
  kay authored Nov 22, 2017
  
  47bb3b85
- Merge branch 'patch-1' into 'master' · f519e283
  kay authored Nov 22, 2017
```
Patch 1

See merge request chaostreffbern/chaostreffbern_website!148
```
  f519e283
21 Nov, 2017 7 commits
- Merge branch 'slides_ML_Vortag_improvement' into 'master' · 66be80c9
  kay authored Nov 21, 2017
```
Added file description in articles

See merge request chaostreffbern/chaostreffbern_website!155
```
  66be80c9
- Added file description in articles · 9d5792eb
  Jens authored Nov 21, 2017
  
  9d5792eb
- Merge branch 'slides_ML_vortrag' into 'master' · 6ff92ed3
  kay authored Nov 21, 2017
```
Slides ml vortrag

See merge request chaostreffbern/chaostreffbern_website!154
```
  6ff92ed3
- fixed wrong language · 30c5d6a5
  Jens authored Nov 21, 2017
  
  30c5d6a5
- Added slides from Machine Learning presentation and news article · 8ebe456c
  Jens authored Nov 21, 2017
  
  8ebe456c
- Update stammtisch_makerspace · c794ca6f
  kay authored Nov 21, 2017
  
  c794ca6f
- Update stammtisch_makerspace · 770a54b4
  kay authored Nov 21, 2017
  
  770a54b4
18 Nov, 2017 1 commit
- Merge branch '2017-11-15_WIP_BÜPF' into 'master' · fa4b2389
  Niklaus Hofer authored Nov 18, 2017
```
Some updates to Pressespiegel

See merge request chaostreffbern/chaostreffbern_website!153
```
  fa4b2389
15 Nov, 2017 2 commits
- Some updates to Pressespiegel · ebaf176f
  hugi authored Nov 15, 2017
  
  ebaf176f
- Merge branch 'ausserordentliche_gv_17' into 'master' · 03359de0
  kay authored Nov 15, 2017
```
Protokoll zur ausserordentlichen GV vom 2017-05-30 des Chaostreff Bern

See merge request chaostreffbern/chaostreffbern_website!152
```
  03359de0
14 Nov, 2017 5 commits
- Protokoll zur ausserordentlichen GV vom 2017-05-30 des Chaostreff Bern · 7a9bc14e
  Niklaus Hofer authored Nov 14, 2017
  
  7a9bc14e
- Merge branch 'gv18_announcement' into 'master' · e6165ccc
  tr authored Nov 14, 2017
```
Gv18 announcement

See merge request chaostreffbern/chaostreffbern_website!151
```
  e6165ccc
- GV 2018 im Kalender · 561a29c8
  Niklaus Hofer authored Nov 14, 2017
  
  561a29c8
- Übersetzung der Ankündigung der 2018 Generalversammlung ins Englische · f7e53ba5
  Niklaus Hofer authored Nov 14, 2017
  
  f7e53ba5
- Ankündigung der 2018 Generalversammlung · f926dce2
  Niklaus Hofer authored Nov 14, 2017
  
  f926dce2
08 Nov, 2017 2 commits
- Merge branch 'events' into 'master' · 3de7b9bd
  kay authored Nov 08, 2017
```
updated events

See merge request chaostreffbern/chaostreffbern_website!149
```
  3de7b9bd
- events: removed 2017-11-07 · 51f75388
  tr authored Nov 08, 2017
  
  51f75388
07 Nov, 2017 4 commits
- events: fix stammtisch · 084af035
  tr authored Nov 07, 2017
  
  084af035
- updated events · ab06598d
  tr authored Nov 07, 2017
  
  ab06598d
- ankündigung stammtisch im makerspace · ff17c294
  kay authored Nov 07, 2017
  
  ff17c294
- ankündigung stammtisch im makerspace · fd668fe3
  kay authored Nov 07, 2017
  
  fd668fe3
01 Nov, 2017 4 commits
- Merge branch 'vortrag_maschinelles_lernen-fix_event_link_again' into 'master' · 215c7622
  Jens authored Nov 01, 2017
```
Added missing '/' to links in events.json

See merge request !146
```
  215c7622
- Added missing '/' to links in events.json · 95c74548
  Jens authored Nov 01, 2017
  
  95c74548
- Merge branch 'vortrag_maschinelles_lernen-fix_event_link' into 'master' · 0892a477
  Jens authored Nov 01, 2017
```
Fixed broken link in events.json

See merge request !145
```
  0892a477
- Fixed broken link in events.json · e4bdf28e
  Jens authored Nov 01, 2017
  
  e4bdf28e
18 Oct, 2017 13 commits
- Merge branch 'vortrag-maschinelles-lernen-fix' into 'master' · 449b8ca3
  kay authored Oct 18, 2017
```
Fixed Links

See merge request !143
```
  449b8ca3
- Fixed stupid formatting · b47ddf85
  Jens authored Oct 18, 2017
  
  b47ddf85
- Fixed Links · eea10424
  Jens authored Oct 18, 2017
  
  eea10424
- Merge branch '2017-10-18_Vortag_Machine_Learning' into 'master' · 98f1920d
  kay authored Oct 18, 2017
```
2017 10 18 vortag machine learning

See merge request !142
```
  98f1920d
- Update vortrag_20171118-maschinelles_lernen.md · a30242de
  Jens authored Oct 18, 2017
  
  a30242de
- Update vortrag_20171118-maschinelles_lernen.md · d86032be
  Jens authored Oct 18, 2017
  
  d86032be
- Update vortrag_20171118-maschinelles_lernen.md · 42951308
  Jens authored Oct 18, 2017
  
  42951308
- Update vortrag_20171118-maschinelles_lernen.md · da701224
  Jens authored Oct 18, 2017
  
  da701224
- Merge branch 'master' into '2017-10-18_Vortag_Machine_Learning', add correct url for event. · 67c905a6
  Jens authored Oct 18, 2017
```
# Conflicts:
#   content/events.json
```
  67c905a6
- Use correct version of events.json · 1dee6f0a
  Jens authored Oct 18, 2017
  
  1dee6f0a
- Fixed syntax error in events.json · 187cd34a
  Jens authored Oct 18, 2017
  
  187cd34a
- Fixed syntax error in events.json · 26b7d979
  Jens authored Oct 18, 2017
  
  26b7d979
- Ankündigung, Flyer und Eventeintrag für Vortrag Maschinelles Lernen hinzugefügt · 39da1b0d
  Jens authored Oct 18, 2017
  
  39da1b0d