From 5b16ac785c859a6139173fddb2747d16297fc5cb Mon Sep 17 00:00:00 2001 From: Alyona Date: Wed, 26 Sep 2018 16:41:33 +0400 Subject: [PATCH] Merge branch 'master' into 23-dashboard # Conflicts: # src/main/resources/templates/papers.html --- src/main/resources/templates/paper.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/resources/templates/paper.html b/src/main/resources/templates/paper.html index 489c28e..7e33073 100644 --- a/src/main/resources/templates/paper.html +++ b/src/main/resources/templates/paper.html @@ -3,10 +3,10 @@ - - - - + + + + NG-Tacker @@ -56,6 +56,7 @@ +
@@ -78,7 +79,7 @@
- +

@@ -88,6 +89,9 @@ +