Google Git
Sign in
apache/cloudstack-docs-admin/f47f4e5ebcd1ac81265cc08812e00a3fc055b639
commit
f47f4e5ebcd1ac81265cc08812e00a3fc055b639
[log]
author
Antoine Le Morvan <antoine@le-morvan.com>
Mon Aug 07 21:51:11 2017 +0200
committer
Antoine Le Morvan <antoine@le-morvan.com>
Mon Aug 07 22:09:26 2017 +0200
tree
49258af6752330bde4f38610a7a2421ec73c4043
parent
aa55c9360ce445e504eebf8dac1af02a8c58f668 [diff]
resolving conflicting files
2 files changed
tree: 49258af6752330bde4f38610a7a2421ec73c4043
  1. .tx/
  2. source/
  3. sphinx_bootstrap_theme/
  4. .gitattributes
  5. .gitignore
  6. LICENSE
  7. make.sh
  8. Makefile
  9. README.rst