Generated gh-pages for commit f14536f
Author: Carlos.Peña <mycalesis@gmail.com>

    editing static resources for documentation
Merge branch 'master' of https://github.com/carlosp420/VoSeq into gh-pages

Conflicts:
	README.md
	admin/add_taxonset.php
	admin/admarkup-functions.php
	admin/adsearch.php
	changelog.md
	create_dataset.php
	includes/process_dataset.php
	installation/NoConfFile.php
	installation/index.php
	installation/install2.php
	installation/install3.php
	installation/install4.php
	installation/install5.php
	markup-functions.php
	search.php
	share_data_gbif.php
	deleted:    README.md
	deleted:    admin/add_taxonset.php
	deleted:    admin/admarkup-functions.php
	deleted:    admin/adsearch.php
	deleted:    changelog.md
	deleted:    create_dataset.php
	deleted:    includes/process_dataset.php
	deleted:    installation/NoConfFile.php
	deleted:    installation/index.php
	deleted:    installation/install2.php
	deleted:    installation/install3.php
	deleted:    installation/install4.php
	deleted:    installation/install5.php
	deleted:    markup-functions.php
	deleted:    search.php
	deleted:    share_data_gbif.php
Generated gh-pages for commit a6449c7
Author: Carlos.Peña <mycalesis@gmail.com>

    updating gh-pages generation