diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-16 17:15:00 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-16 17:15:00 +0100 |
| commit | 0b0b0d65ee05583529df831985580e392713d29a (patch) | |
| tree | 7eb6799a996924d8e895c54633a47ea3d7a92a4c /root | |
| parent | 3d30e9cc9014ec6189410944015d3cd7d5ca95a6 (diff) | |
| parent | b7a92f63884af00eb0243ec9328be689a6c9b845 (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 |