zadam f921562346 Merge branch 'm38' ... # Conflicts: # docs/backend_api/Note.html # docs/frontend_api/NoteShort.html # src/services/import/enex.js		2019-11-18 23:26:29 +01:00
..
api	Merge branch 'm38'	2019-11-18 23:26:29 +01:00
custom.js	uploading new file revisions	2019-11-09 11:58:52 +01:00
electron.js	fix csrf protection on electron build	2019-03-31 12:49:42 +02:00
index.js	fixes & tweaks	2019-08-28 21:15:16 +02:00
login.js	fix redirect after login	2019-05-22 21:25:13 +02:00
routes.js	erasing note revisions	2019-11-09 15:21:14 +01:00
setup.js	#98, new option "initialized" which indicates if setup has been finished	2018-07-24 08:12:36 +02:00