diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:23:26 +0100 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:25:08 +0100 |
| commit | 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 (patch) | |
| tree | 3f1ff4523e24671e5992008e6ac2d9f299942cfa /test/confs/0902 | |
| parent | 7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff) | |
Merge from master into 4.next
Done with git merge --squash -x theirs master
Diffstat (limited to 'test/confs/0902')
| l--------- | test/confs/0902 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/confs/0902 b/test/confs/0902 new file mode 120000 index 000000000..1bb987150 --- /dev/null +++ b/test/confs/0902 @@ -0,0 +1 @@ +0900
\ No newline at end of file |