diff options
| author | makefu <github@syntax-fehler.de> | 2016-02-15 17:07:48 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-02-15 17:07:48 +0100 |
| commit | 34471904f61dfe59fb36e2a686b07a9436b601bf (patch) | |
| tree | ce2f7a874350e94f060101519d063c779e6a3293 /root | |
| parent | 0f49d7fa7202d9854b382ada864c8e9506c71ba0 (diff) | |
| parent | 6e6c783a148293acdbfbfeb36c4bd0ef69b9d8ee (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'root')
| l--------- | root | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -1 +0,0 @@ -../stockholm-user
\ No newline at end of file |