From 08140811870c8a3aca399c957833a1838cea3c27 Mon Sep 17 00:00:00 2001 From: Alyona Date: Wed, 26 Sep 2018 16:11:43 +0400 Subject: [PATCH] Merge branch 'master' into 23-dashboard # Conflicts: # src/main/resources/templates/papers.html --- src/main/resources/templates/papers.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/resources/templates/papers.html b/src/main/resources/templates/papers.html index d1eb467..92441c7 100644 --- a/src/main/resources/templates/papers.html +++ b/src/main/resources/templates/papers.html @@ -13,11 +13,6 @@

Статьи

Перейти на тестовую страницу Алёны
-
- -
-