diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-06 18:45:38 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-06 18:45:38 +0100 |
| commit | fe586d704eed42421ad3fe0d140c0caa64764a68 (patch) | |
| tree | a07d0c4d09ef780f703ae03435d51ac60019c956 /root | |
| parent | 138bdc6bf6a18a59cf47d2d2db7c4e7640f50641 (diff) | |
| parent | c784d271c5dc8783e5e6308baf4f6dd26430bfca (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'root')
| l--------- | root | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -0,0 +1 @@ +../stockholm-user
\ No newline at end of file |