tag 7.4.0

ralsina · ralsina · commit 3f3a051690f7 · 2015-05-05T11:05:51.000-03:00
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,4 +1,4 @@
-New in master
+New in v7.4.0
 =============
 
 Features
diff --git a/docs/extending.txt b/docs/extending.txt
@@ -8,7 +8,7 @@
 Extending Nikola
 ================
 
-:Version: 7.3.1
+:Version: 7.4.0
 :Author: Roberto Alsina <ralsina@netmanagers.com.ar>
 
 .. class:: alert alert-info pull-right
diff --git a/docs/getting-help.txt b/docs/getting-help.txt
@@ -3,7 +3,7 @@
 .. date: 1970-01-01 15:00:00
 .. description: Get help using Nikola, or contact us.
 
-:Version: 7.3.1
+:Version: 7.4.0
 
 .. class:: alert alert-info pull-right
 
diff --git a/docs/man/nikola.1.gz b/docs/man/nikola.1.gz
diff --git a/docs/manual.txt b/docs/manual.txt
@@ -8,7 +8,7 @@
 The Nikola Handbook
 ===================
 
-:Version: 7.3.1
+:Version: 7.4.0
 
 .. class:: alert alert-info pull-right
 
diff --git a/docs/social_buttons.txt b/docs/social_buttons.txt
@@ -8,7 +8,7 @@
 Using Alternative Social Buttons with Nikola
 ============================================
 
-:Version: 7.3.1
+:Version: 7.4.0
 
 .. class:: alert alert-info pull-right
 
diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '7.3.1'
+version = '7.4.0'
 # The full version, including alpha/beta/rc tags.
-release = '7.3.1'
+release = '7.4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/theming.txt b/docs/theming.txt
@@ -8,7 +8,7 @@
 Theming Nikola
 ==============
 
-:Version: 7.3.1
+:Version: 7.4.0
 :Author: Roberto Alsina <ralsina@netmanagers.com.ar>
 
 .. class:: alert alert-info pull-right
diff --git a/docs/upgrading-to-v6.txt b/docs/upgrading-to-v6.txt
@@ -8,7 +8,7 @@
 Upgrading to v6
 ===============
 
-:Version: 7.3.1
+:Version: 7.4.0
 
 .. class:: lead
 
diff --git a/nikola/__init__.py b/nikola/__init__.py
@@ -27,7 +27,7 @@
 from __future__ import absolute_import
 import os
 
-__version__ = "7.3.1"
+__version__ = "7.4.0"
 DEBUG = bool(os.getenv('NIKOLA_DEBUG'))
 
 from .nikola import Nikola  # NOQA
diff --git a/setup.py b/setup.py
@@ -112,7 +112,7 @@ def run(self):
 
 
 setup(name='Nikola',
-      version='7.3.1.1',
+      version='7.4.0',
       description='A modular, fast, simple, static website generator',
       long_description=open('README.rst').read(),
       author='Roberto Alsina and others',

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-New in master`
	`1`	`+New in v7.4.0`
`2`	`2`	`=============`
`3`	`3`
`4`	`4`	`Features`