Mikael Nordfeldth 980085a8a3 Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes
Conflicts:
	plugins/Minify/extlib/minify/README.txt
	plugins/Minify/extlib/minify/UPGRADING.txt
	plugins/Minify/extlib/minify/min/README.txt
	plugins/Minify/extlib/minify/min/builder/index.php
	plugins/Minify/extlib/minify/min/lib/JSMin.php
	plugins/Minify/extlib/minify/min/lib/Minify.php
	plugins/Minify/extlib/minify/min/lib/Minify/CSS.php
	plugins/Minify/extlib/minify/min/lib/Minify/CSS/Compressor.php
	plugins/Minify/extlib/minify/min/lib/Minify/Controller/Page.php
	plugins/Minify/extlib/minify/min/lib/Minify/Packer.php
	plugins/Recaptcha/RecaptchaPlugin.php
2016-03-21 03:10:19 +01:00
..
2016-03-20 13:06:58 +00:00
2016-03-10 15:15:06 +01:00
2016-03-20 13:06:58 +00:00
2011-09-22 09:19:46 -04:00

* To use a theme other than neo, add this to config.php:
$config['site']['theme'] = 'yourthemename';

* To use/import the base theme, add this to your theme.ini file:
include=base

* To include an external CSS resource (e.g. for a webfont), add this to the top of your theme.ini file:
external[]="yourexternalURL"