Dan Brown 756b55bbff Merge branch 'conflict_warnings' of https://github.com/MatthieuParis/BookStack into MatthieuParis-conflict_warnings		2021-10-04 17:10:40 +01:00
..
icons	Reviewed tag in seach work	2021-05-24 16:12:09 +01:00
js	Display warnings when saving draft if another user is editing the page or if the page was updated since the current user has started editing the page.	2021-08-08 19:20:15 +02:00
lang	New Crowdin updates (#2926)	2021-10-04 16:22:16 +01:00
sass	Made the TOTP URL visible during setup	2021-09-01 20:58:19 +01:00
views	Reviewed adding IP recording to activity & audit log	2021-09-26 17:18:12 +01:00