Merge branch 'stable'

Conflicts:
	docs/source/siteadmin/deploying.rst
This commit is contained in:
Christopher Allan Webber 2015-03-19 20:44:49 -05:00
commit 82be36d125

View File

@ -193,7 +193,7 @@ Change to the MediaGoblin directory that you just created::
Clone the MediaGoblin repository and set up the git submodules::
git clone git://gitorious.org/mediagoblin/mediagoblin.git -b stable
git clone https://gitorious.org/mediagoblin/mediagoblin.git -b stable
cd mediagoblin
git submodule init && git submodule update