syncSrv1.1
sync plugins
sync

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of https://github.com/xpander54/cursos-gv-wp

Conflicts:
	wp-content/plugins/wordpress-bootstrap-
css/inc/Less.php/Exception/Chunk.php
	wp-content/plugins/wordpress-bootstrap-
css/inc/Less.php/Tree/DefaultFunc.php
	wp-content/plugins/wordpress-bootstrap-
css/inc/Less.php/Tree/DetachedRuleset.php
	wp-content/plugins/wordpress-bootstrap-
css/inc/Less.php/Tree/NameValue.php
	wp-content/plugins/wordpress-bootstrap-
css/inc/Less.php/Tree/RulesetCall.php
	wp-content/plugins/wordpress-bootstrap-
css/resources/bootstrap-3.1.1/css/bootstrap-theme.css.map
	wp-content/plugins/wordpress-bootstrap-
css/resources/bootstrap-3.1.1/css/bootstrap.css.map
	wp-content/plugins/wordpress-bootstrap-
css/resources/bootstrap-3.1.1/css/bootstrap.min.css
	wp-content/plugins/wordpress-bootstrap-
css/resources/bootstrap-3.1.1/fonts/glyphicons-halflings-regular.eot
	wp-content/plugins/wordpress-bootstrap-
css/resources/bootstrap-3.1.1/fonts/glyphicons-halflings-regular.woff
	wp-content/plugins/wordpress-bootstrap-
css/resources/bootstrap-3.1.1/js/bootstrap.min.js
	wp-content/plugins/wordpress-bootstrap-
css/resources/css/plugin.css