BookStack Code Mirror - bookstack/commit

]> BookStack Code Mirror - bookstack/commit

projects / bookstack / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 410e967 4e71a5a)

author	Abijeet <redacted>
	Tue, 18 Apr 2017 19:51:45 +0000 (01:21 +0530)
committer	Abijeet <redacted>
	Tue, 18 Apr 2017 19:51:45 +0000 (01:21 +0530)
commit	b3d4c199aefd6066c444898eada3c8bb43dc5cb5
tree	bfb17c97e12f2e3ee09dcfb3458a9441f1405382	tree \| snapshot
parent	410e967eb10b87e43087f77569b662c9745a4b1e	commit \| diff
parent	4e71a5a47b97bee59b8afff98b510c4d0d7ead15	commit \| diff

Merge branch 'master' of https://github.com/Abijeet/BookStack

Conflicts:
.gitignore

16 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
app/Comment.php	diff1 \|	\|	blob \| history
app/Http/Controllers/CommentController.php	diff1 \|	\|	blob \| history
app/Http/Controllers/PageController.php	diff1 \|	diff2 \|	blob \| history
app/Repos/CommentRepo.php	diff1 \|	\|	blob \| history
app/Services/PermissionService.php	diff1 \|	diff2 \|	blob \| history
public/libs/simplemde/simplemde.min.js	\|	\|	blob
resources/assets/js/controllers.js	diff1 \|	diff2 \|	blob \| history
resources/assets/js/directives.js	diff1 \|	diff2 \|	blob \| history
resources/assets/sass/_pages.scss	diff1 \|	diff2 \|	blob \| history
resources/assets/sass/_variables.scss	diff1 \|	diff2 \|	blob \| history
resources/assets/sass/export-styles.scss	diff1 \|	diff2 \|	blob \| history
resources/assets/sass/styles.scss	diff1 \|	diff2 \|	blob \| history
resources/lang/en/entities.php	diff1 \|	diff2 \|	blob \| history
resources/views/pages/show.blade.php	diff1 \|	diff2 \|	blob \| history
routes/web.php	diff1 \|	diff2 \|	blob \| history

The core source code for the BookStack project.