]> BookStack Code Mirror - bookstack/commit
Merge branch 'master' of https://github.com/BookStackApp/BookStack
authorAbijeet <redacted>
Sun, 20 Aug 2017 15:05:56 +0000 (20:35 +0530)
committerAbijeet <redacted>
Sun, 20 Aug 2017 15:05:56 +0000 (20:35 +0530)
commit47d82a1ac2ec323295eb57ffe3beaf513e841496
tree668d7016c7935393e105d5cc6b137845264f6d92
parent703d579561096fef7b8d44b981966475e4cd95a3
parent28a9bd514f65638c78b07380d75dfb01070cff0c
Merge branch 'master' of https://github.com/BookStackApp/BookStack

Conflicts:
resources/assets/js/vues/vues.js
resources/assets/js/vues/vues.js