projects / kohadocs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07c6fb9 217f455)
Merge branch 'master' into 'MoveLinks'
authorKatrin Fischer <katrin.fischer.83@web.de>
Sun, 6 May 2018 16:27:35 +0000 (16:27 +0000)
committerKatrin Fischer <katrin.fischer.83@web.de>
Sun, 6 May 2018 16:27:35 +0000 (16:27 +0000)
# Conflicts:
#   source/index.rst

1  2 
source/index.rst patch | diff1 | diff2 | blob | history
source/miscellaneous.rst patch | diff1 | diff2 | blob | history

diff --cc source/index.rst
index a818088,ede4c88..51e7b2c
--- 1/source/index.rst
--- 2/source/index.rst
+++ b/source/index.rst
@@@ -29,7 -29,7 +29,8 @@@ Koha 18.05 Manual (en
     cron_jobs
     webservices
     miscellaneous
+    extending_koha
 +   links
     faq
     license
  
diff --cc source/miscellaneous.rst
Simple merge
Mirror of Koha documentation repository