diff options
| author | MaZderMind <git@mazdermind.de> | 2015-09-02 15:19:30 +0200 |
|---|---|---|
| committer | MaZderMind <git@mazdermind.de> | 2015-09-02 15:19:30 +0200 |
| commit | 20d75f6c7f5cad2f5c1b4da71ad5405848230201 (patch) | |
| tree | 93894d7bc79a0b018275efbc0db524ac6f686570 /.gitignore | |
| parent | a004948051e182edb3a7e40f1f7f2e14bebb0e0e (diff) | |
| parent | 8646386d09ab6cdabf0b8421cece5c1ddd69633f (diff) | |
Merge branch 'control-server-resilience'
Based on the work made by zuntrax & mithro at cccamp15
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions