Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Xenapi-Admin-Project/xena…
Browse files Browse the repository at this point in the history 
…pi-admin-docs

Conflicts:
	README.md
  • Loading branch information
@GrantPMcW
GrantPMcW committed Nov 30, 2012
2 parents 66d11ac + 9f66b32 commit 783fbbb
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions README.md
View file

This file was deleted.

0 comments on commit 783fbbb

Please sign in to comment.