fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-10 16:48:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Doc changes

Browse source
This commit is contained in:
Manuel Ebert 2014-08-04 17:21:18 +02:00
parent 84d886d0ef
commit 0a28a9807b
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -1,6 +1,12 @@
Changelog Changelog
========= =========
## 2.0
* Cryptographical backend changed from PyCrypto to cryptography.io
* Config now respects XDG conventions and may move accordingly
* Config now saved as YAML
* Config name changed from `journals.jrnl_name.journal` to `journals.jrnl_name.path`
### 1.9 (July 21, 2014) ### 1.9 (July 21, 2014)

1
jrnl/util.py
View file

@ -103,7 +103,6 @@ def yesno(prompt, default=True):
def load_config(config_path): def load_config(config_path):
"""Tries to load a config file from YAML. """Tries to load a config file from YAML.
If that fails, fall back to JSON.
""" """
with open(config_path) as f: with open(config_path) as f:
config = yaml.load(f) config = yaml.load(f)