fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-06-29 14:06:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge master and fix merge conflict

Browse source 
Signed-off-by: Aniket Pant <me@aniketpant.com>
This commit is contained in:
Aniket Pant 2013-06-26 11:19:10 +05:30
commit c9d5e13667
4 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -3,10 +3,16 @@ Changelog
#### 1.1.1
<<<<<<< HEAD
* [New] Export to multiple files
* [New] Feature to export to given output file
#### 1.1.0
=======
* [Fixed] Unicode and Python3 issues resolved.
### 1.1.0
>>>>>>> master
* [New] JSON export exports tags as well.
* [Improved] Nicer error message when there is a syntactical error in your config file.