Merge branch 'master' of git.evergreen-ils.org:Evergreen-DocBook
[working/Evergreen.git] / README
1 <<<<<<< HEAD
2 This is the documentation for the Evergreen Open-ILS project. It is maintained by DIG volunteers. For the published documentation, visit: http://docs.evergreen-ils.org
3
4 <<<<<<< HEAD
5 test edit.
6 edited from clone of official.
7 =======
8 edited from github.
9 >>>>>>> 6a6e1fef279d3d13450020fca14edbccef4fd7af