diff options
| author | Siri Reiter <siri@jones.dk> | 2018-04-16 17:02:02 +0200 |
|---|---|---|
| committer | Siri Reiter <siri@jones.dk> | 2018-04-16 17:02:02 +0200 |
| commit | 68eab67e77d21a24f5a2a608128ffa6265850b6e (patch) | |
| tree | d423bee39477cfa41f119b1c99ce533a822d8a41 /talks | |
| parent | 3ba95b1ae625758104f095fb275468b8166f415a (diff) | |
| parent | df09222c7497343acb8e0ee016593bd31ccbcdda (diff) | |
Fix conflicts.
Diffstat (limited to 'talks')
0 files changed, 0 insertions, 0 deletions