<<<<<<< HEAD repoPrueba

Repositorio de prueba para el proyecto Drupal7

Repo de prueba 2

origin/master

Name		Name	Last commit message	Last commit date
Latest commit History 1 Commit
includes		includes
misc		misc
modules		modules
nbproject		nbproject
profiles		profiles
scripts		scripts
sites		sites
themes		themes
.gitignore		.gitignore
.htaccess		.htaccess
CHANGELOG.txt		CHANGELOG.txt
COPYRIGHT.txt		COPYRIGHT.txt
INSTALL.mysql.txt		INSTALL.mysql.txt
INSTALL.pgsql.txt		INSTALL.pgsql.txt
INSTALL.sqlite.txt		INSTALL.sqlite.txt
INSTALL.txt		INSTALL.txt
LICENSE.txt		LICENSE.txt
MAINTAINERS.txt		MAINTAINERS.txt
README.md		README.md
README.txt		README.txt
UPGRADE.txt		UPGRADE.txt
authorize.php		authorize.php
cron.php		cron.php
index.php		index.php
install.php		install.php
robots.txt		robots.txt
update.php		update.php
web.config		web.config
xmlrpc.php		xmlrpc.php