Public Git Hosting - KisSync.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: f597cb7 c6f9b16)

commit	61122f71f1f7770d7e79db10649696391cf44c20
author	ECHibiki <ECVerniy@gmail.com>
	Wed, 20 Feb 2019 19:23:59 +0000 (20 14:23 -0500)
committer	ECHibiki <ECVerniy@gmail.com>
	Wed, 20 Feb 2019 19:23:59 +0000 (20 14:23 -0500)
tree	97fa023a051f522e452cd69e8e1df619bf43d0b3	tree \| snapshot (tar.gz zip)
parent	f597cb767f0572dac2ef4c807fa70ae85c807f92	commit \| diff
parent	c6f9b1611e88fe0dc6eb9345f59bf8bfb07a0a04	commit \| diff

Merge branch '3.0' of github.com:calzoneman/sync into 3.0

LICENSE	diff1 \|	diff2 \|	blob \| history
config.template.yaml	diff1 \|	diff2 \|	blob \| history
docs/custom-media.md	diff1 \|	diff2 \|	blob \| history
package.json	diff1 \|	diff2 \|	blob \| history
player/dailymotion.coffee	diff1 \|	diff2 \|	blob \| history
src/config.js	diff1 \|	diff2 \|	blob \| history
src/io/ioserver.js	diff1 \|	diff2 \|	blob \| history
src/server.js	diff1 \|	diff2 \|	blob \| history
src/web/pug.js	diff1 \|	diff2 \|	blob \| history
templates/footer.pug	diff1 \|	diff2 \|	blob \| history
templates/head.pug	diff1 \|	diff2 \|	blob \| history