Merge branch 'patch-1' of git://github.com/evaryont/jrnl into evaryont-patch-1

This commit is contained in:
Manuel Ebert 2013-04-19 16:50:27 +02:00
commit 02da463f10

View file

@ -31,7 +31,7 @@ __version__ = '1.0.0-rc1'
__author__ = 'Manuel Ebert, Stephan Gabler' __author__ = 'Manuel Ebert, Stephan Gabler'
__license__ = 'MIT' __license__ = 'MIT'
CONFIG_PATH = os.path.expanduser('~/.jrnl_config') CONFIG_PATH = os.environ.get('JRNL_CONFIG', os.path.expanduser('~/.jrnl_config'))
PYCRYPTO = install.module_exists("Crypto") PYCRYPTO = install.module_exists("Crypto")
def parse_args(): def parse_args():