]> BookStack Code Mirror - bookstack/commit
Merge branch 'master' of https://github.com/Abijeet/BookStack
authorAbijeet <redacted>
Tue, 18 Apr 2017 19:51:45 +0000 (01:21 +0530)
committerAbijeet <redacted>
Tue, 18 Apr 2017 19:51:45 +0000 (01:21 +0530)
commitb3d4c199aefd6066c444898eada3c8bb43dc5cb5
treebfb17c97e12f2e3ee09dcfb3458a9441f1405382
parent410e967eb10b87e43087f77569b662c9745a4b1e
parent4e71a5a47b97bee59b8afff98b510c4d0d7ead15
Merge branch 'master' of https://github.com/Abijeet/BookStack

Conflicts:
.gitignore
16 files changed:
.gitignore
app/Comment.php
app/Http/Controllers/CommentController.php
app/Http/Controllers/PageController.php
app/Repos/CommentRepo.php
app/Services/PermissionService.php
public/libs/simplemde/simplemde.min.js
resources/assets/js/controllers.js
resources/assets/js/directives.js
resources/assets/sass/_pages.scss
resources/assets/sass/_variables.scss
resources/assets/sass/export-styles.scss
resources/assets/sass/styles.scss
resources/lang/en/entities.php
resources/views/pages/show.blade.php
routes/web.php
Morty Proxy This is a proxified and sanitized view of the page, visit original site.