diff --git a/knowledge-base.yaml b/knowledge-base.yaml
index 2dd2683..51e1c05 100644
--- a/knowledge-base.yaml
+++ b/knowledge-base.yaml
@@ -11,6 +11,9 @@ params:
       authors: true   # show article authors in the article header
       topics: true    # show assigned topics in the article header
       time: true      # show reading time in the article header
+    git:
+      tree: https://github.com/Perlkonig/grav-skeleton-knowledge-base/blob/master/ 
+      commits: https://github.com/Perlkonig/grav-skeleton-knowledge-base/commits/master/
   front:              # params for the front page content
     maxrows: 3        # the maximum number of rows on the front page
     maxentries: 5     # maximum number of articles displayed for each category
diff --git a/languages.yaml b/languages.yaml
index 0ec14d9..d5b09ed 100644
--- a/languages.yaml
+++ b/languages.yaml
@@ -10,6 +10,8 @@ en:
     RELATED_ARTICLES: Related Articles
     COMMENTS: Comments
     CATEGORY: "Category:"
+    GIT_PAGE_EDIT: "Edit this page"
+    GIT_PAGE_HISTORY: "View history"
 fr:
     FOOTER_TEXT: <p><a href="https://github.com/Perlkonig/grav-theme-knowledge-base">Ce thème</a> à été <i class="fa fa-code"></i> avec <i class="fa fa-heart"></i> par <a href="http://perlkonig.com">Perlk&ouml;nig</a>.</p>
     CATEGORIES: Catégories
@@ -22,6 +24,8 @@ fr:
     RELATED_ARTICLES: Articles similaires
     COMMENTS: Commentaires
     CATEGORY: "Catégorie : "
+    GIT_PAGE_EDIT: "Editer cette page"
+    GIT_PAGE_HISTORY: "Voir l'historique"
 cs:
     FOOTER_TEXT: <p><a href="https://github.com/Perlkonig/grav-theme-knowledge-base">Tento motiv</a> byl <i class="fa fa-code"></i>-án s <i class="fa fa-heart"></i> uživatelem <a href="http://perlkonig.com">Perlk&ouml;nig</a>.</p>
     CATEGORIES: Kategorie
diff --git a/templates/item.html.twig b/templates/item.html.twig
index 8e7bfa1..7f985ce 100644
--- a/templates/item.html.twig
+++ b/templates/item.html.twig
@@ -40,6 +40,12 @@
 		{% if grav.theme.config.params.articles.show.time %}
 			<span>{{ page.content|readingtime }}</span>
 		{% endif %}
+		{% if grav.theme.config.params.articles.git.tree %}
+			<span>{% include 'partials/git_edit_link.html.twig' %}</span>
+		{% endif %}
+		{% if grav.theme.config.params.articles.git.commits %}
+			<span>{% include 'partials/git_history_link.html.twig' %}</span>
+		{% endif %}
 		</div>
 	{% endif %}
 	</section>
diff --git a/templates/partials/git_edit_link.html.twig b/templates/partials/git_edit_link.html.twig
new file mode 100644
index 0000000..90795fb
--- /dev/null
+++ b/templates/partials/git_edit_link.html.twig
@@ -0,0 +1 @@
+<a class="github-link" href="{{ grav.theme.config.params.articles.git.tree ~  ('/'~page.filePathClean)|regex_replace( '@/user(?:/sites/[a-zA-Z0-9_-]+)?/@' , '' ) }}"><i class="fa fa-git-square"></i> {{ 'GIT_PAGE_EDIT'|t }}</a>
\ No newline at end of file
diff --git a/templates/partials/git_history_link.html.twig b/templates/partials/git_history_link.html.twig
new file mode 100644
index 0000000..1f7cadf
--- /dev/null
+++ b/templates/partials/git_history_link.html.twig
@@ -0,0 +1 @@
+<a class="github-link" href="{{ grav.theme.config.params.articles.git.commits ~  ('/'~page.filePathClean)|regex_replace( '@/user(?:/sites/[a-zA-Z0-9_-]+)?/@' , '' ) }}"><i class="fa fa-history"></i> {{ 'GIT_PAGE_HISTORY'|t }}</a>
\ No newline at end of file