Merge remote-tracking branch 'origin/4-show-time-line' into 4-show-time-line

src/main/resources/templates/timeline.html

@@ -19,21 +19,17 @@
                     <ul class="timeline">
                         <li>
                             <div class="timeline-image">
-                                <h4>Be Part
-                                    <br/>Of Our
-                                    <br/>Story!</h4>
+                                <h4>
+                                    <br/>
+                                    02.07.2018
+                                </h4>
                             </div>
                             <div class="timeline-panel">
                                 <div class="timeline-heading">
-                                    <h4>2009-2011</h4>
-                                    <h4 class="subheading">Our Humble Beginnings</h4>
+                                    <h4>Уход в отпуск</h4>
                                 </div>
                                 <div class="timeline-body">
-                                    <p class="text-muted">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sunt
-                                        ut
-                                        voluptatum eius sapiente, totam reiciendis temporibus qui quibusdam, recusandae
-                                        sit
-                                        vero unde, sed, incidunt et ea quo dolore laudantium consectetur!</p>
+                                    <p class="text-muted">Наконец-то!</p>
                                 </div>
                             </div>
                         </li>