git.librecmc.org Git - oweals/peertube.git/commit

projects / oweals / peertube.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 052937d c4403b2)

author	Chocobozzz <florian.bigard@gmail.com>
	Sun, 2 Oct 2016 13:39:09 +0000 (15:39 +0200)
committer	Chocobozzz <florian.bigard@gmail.com>
	Sun, 2 Oct 2016 13:39:09 +0000 (15:39 +0200)
commit	a6375e69668ea42e19531c6bc68dcd37f3f7cbd7
tree	03204a408d56311692c3528bedcf95d2455e94f2	tree \| snapshot
parent	052937db8a8d282eccdbdf38d487ed8d85d3c0a7	commit \| diff
parent	c4403b29ad4db097af528a7f04eea07e0ed320d0	commit \| diff

Merge branch 'master' into webseed-merged

14 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
client/src/app/shared/auth/auth.service.ts	diff1 \|	diff2 \|	blob \| history
client/src/app/videos/video-watch/video-watch.component.ts	diff1 \|	diff2 \|	blob \| history
config/default.yaml	diff1 \|	diff2 \|	blob \| history
config/test-1.yaml	diff1 \|	diff2 \|	blob \| history
config/test-2.yaml	diff1 \|	diff2 \|	blob \| history
config/test-3.yaml	diff1 \|	diff2 \|	blob \| history
config/test-4.yaml	diff1 \|	diff2 \|	blob \| history
config/test-5.yaml	diff1 \|	diff2 \|	blob \| history
config/test-6.yaml	diff1 \|	diff2 \|	blob \| history
package.json	diff1 \|	diff2 \|	blob \| history
server.js	diff1 \|	diff2 \|	blob \| history
server/initializers/constants.js	diff1 \|	diff2 \|	blob \| history
server/models/video.js	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.