Sign in
apache
/
cloudstack-docs-admin
/
2413ecb688e4947d38e67620eb886be3bdeed09a
commit
2413ecb688e4947d38e67620eb886be3bdeed09a
[
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 21:51:11 2017 +0200
tree
25386faf90a2a15d35684a6c8c0b8fe9523f383b
parent
4a2d1ad52768194894a0f09ad1cebb9f8b9f700c
[
diff
]
resolving conflicting files
source/locale/fr/LC_MESSAGES/networking/public_ips_and_vlans_for_accounts.mo
[
diff
]
source/locale/fr/LC_MESSAGES/networking/public_ips_and_vlans_for_accounts.po
[
diff
]
source/locale/fr/LC_MESSAGES/networking2.mo
[
diff
]
source/locale/fr/LC_MESSAGES/networking2.po
[
diff
]
source/locale/fr/LC_MESSAGES/networking_and_traffic.mo
[
diff
]
source/locale/fr/LC_MESSAGES/networking_and_traffic.po
[
diff
]
6 files changed
tree: 25386faf90a2a15d35684a6c8c0b8fe9523f383b
.tx/
source/
sphinx_bootstrap_theme/
.gitattributes
.gitignore
LICENSE
make.sh
Makefile
README.rst
