Dan Brown 68a149109a Merge branch 'master' of github.com:ssddanbrown/BookStack		2015-10-14 22:13:08 +01:00
..
assets	Added margins to floated images and updated editor controls. Fixes #18.	2015-10-14 22:12:46 +01:00
lang/en	Added filtering to activity lists. Fixes #14.	2015-08-30 11:47:58 +01:00
views	Merge branch 'master' of github.com:ssddanbrown/BookStack	2015-10-14 22:13:08 +01:00