Artyom Kravchenko 7a5c7faf91 resolve merge conflicts

2021-02-11 01:55:28 +03:00

..

base.html

resolve merge conflicts

2021-02-11 01:55:28 +03:00

menu.html

Login template now extends base/base.html

2021-02-09 23:42:23 +03:00