rugk e483d60eed Merge branch 'historyupdate' ... Conflicts: tpl/bootstrap.php tpl/page.php And update SRI. @elrido also did not properly merge this branch. Doing it now…		2017-02-06 20:25:35 +01:00
..
.editorconfig	Add loading indicator	2017-02-05 22:09:46 +01:00
bootstrap.php	Merge branch 'historyupdate'	2017-02-06 20:25:35 +01:00
page.php	Merge branch 'historyupdate'	2017-02-06 20:25:35 +01:00