Skip to content
Snippets Groups Projects
Commit 72ed0a73 authored by Yann Leboulanger's avatar Yann Leboulanger
Browse files

fix merge error. Fixes #5154

parent 278a8bc5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
configure.ac
+ 1
− 1
View file @ 72ed0a73
AC_INIT([Gajim - A Jabber Instant Messager],
[0.12.1.5-dev],[http://trac.gajim.org/],[gajim])
[0.12.3.1-dev],[http://trac.gajim.org/],[gajim])
AC_PREREQ([2.59])
AC_CONFIG_HEADER(config.h)
......
src/common/defs.py
+ 1
− 1
View file @ 72ed0a73
......@@ -27,7 +27,7 @@ docdir = '../'
datadir = '../'
localedir = '../po'
version = '0.12.1.5-dev'
version = '0.12.3.1-dev'
import sys, os.path
for base in ('.', 'common'):
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment