Merge branch 'master' into python3

Conflicts:
	.gitignore
This commit is contained in:
James Booth
2016-07-24 01:22:29 +01:00
135 changed files with 137 additions and 137 deletions

View File

@@ -16,7 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Profanity. If not, see <http://www.gnu.org/licenses/>.
* along with Profanity. If not, see <https://www.gnu.org/licenses/>.
*
* In addition, as a special exception, the copyright holders give permission to
* link the code of portions of this program with the OpenSSL library under