]> BookStack Code Mirror - bookstack/commitdiff
projects / bookstack / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02fd1c4 2261308)
Merge branch 'master' of git://github.com/Abijeet/BookStack
authorDan Brown <redacted>
Thu, 7 Dec 2017 18:47:07 +0000 (18:47 +0000)
committerDan Brown <redacted>
Thu, 7 Dec 2017 18:47:07 +0000 (18:47 +0000)
1  2 
resources/assets/sass/_grid.scss patch | diff1 | diff2 | blob | history
resources/assets/sass/_lists.scss patch | diff1 | diff2 | blob | history

diff --cc resources/assets/sass/_grid.scss
Simple merge
diff --cc resources/assets/sass/_lists.scss
Simple merge
The core source code for the BookStack project.