 Lars Gierth
|
7d79b0d4b3
doc: fix merge conflict artifacts
|
%!s(int64=9) %!d(string=hai) anos |
|
Lars Gierth
|
27e72fdb64
Merge commit 'f9a5124ea0273c5a3ff448aa3157d10b44ebab2b'
|
%!s(int64=9) %!d(string=hai) anos |
 Caleb James DeLisle
|
c4674a387a
Clarified the licensing stuff in /doc/
|
%!s(int64=9) %!d(string=hai) anos |
|
Lars Gierth
|
3718ba2584
Merge commit '9ef45d9d8fb5b86da848b0ec3da0938c6c9644ff'
|
%!s(int64=9) %!d(string=hai) anos |
|
Lars Gierth
|
6f658cc4a3
Merge commit '1f62015d7f88eb0eb261df2e38bca34def674004' as 'doc'
|
%!s(int64=9) %!d(string=hai) anos |
