Merge branch 'pr/merge-v2.1'

Conflicts:
setup.py
This commit is contained in:
Jonathan Wren 2019-10-05 16:00:52 -07:00
commit f9e746fe24
8 changed files with 511 additions and 141 deletions

View file

@ -1,14 +1,9 @@
#!/usr/bin/env python
# encoding: utf-8
import pkg_resources
"""
jrnl is a simple journal application for your command line.
"""
from __future__ import absolute_import
dist = pkg_resources.get_distribution('jrnl')
__title__ = dist.project_name
__version__ = dist.version
__title__ = 'jrnl'
__version__ = '2.0.0-rc3'
__author__ = 'Manuel Ebert'
__license__ = 'MIT License'
__copyright__ = 'Copyright 2013 - 2015 Manuel Ebert'