diff options
| author | Akko Teru <none@null.nil> | 2016-01-18 01:50:13 -0600 |
|---|---|---|
| committer | Akko Teru <none@null.nil> | 2016-01-18 01:50:13 -0600 |
| commit | 5a55c8409d241cb47946e93cf0a4d2deeb995a18 (patch) | |
| tree | 94901b85fddf8a4cdaa8dab02c2d255dfcbb6e67 /doc | |
| parent | e0058a976a62767f899c54ef6b20827ff344484d (diff) | |
| parent | 2195bf8bbe64dd5a830fcdb137e80c9ddaabf35e (diff) | |
| download | serverdata-5a55c8409d241cb47946e93cf0a4d2deeb995a18.tar.gz serverdata-5a55c8409d241cb47946e93cf0a4d2deeb995a18.tar.bz2 serverdata-5a55c8409d241cb47946e93cf0a4d2deeb995a18.tar.xz serverdata-5a55c8409d241cb47946e93cf0a4d2deeb995a18.zip | |
Merge branch 'master' of gitlab.com:evol/serverdata
Try to resolve conflict by using brute force and ignorance.
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions