diff options
| author | Andrey Andreev <narf@devilix.net> | 2013-08-07 12:38:16 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2013-08-07 12:38:16 +0200 |
| commit | 537181090448b5ad10283dd933861b5b1de6a568 (patch) | |
| tree | 2fbbe2815a356840ee840f5061fe62e96bf1feee /license.txt | |
| parent | b799a0b3f09238fe46892b811025e7bf2ac81b19 (diff) | |
| parent | 1c75780da904b2a56c30c693fc3e03d2145614c2 (diff) | |
Merge pull request #2589 from vlakoff/feature/user-guide-cleanup
Fix a few more merge conflicts
Diffstat (limited to 'license.txt')
0 files changed, 0 insertions, 0 deletions