Audrius Butkevicius 5fe15475a4 Merge pull request #1540 from calmh/conflicts ... Handle conflicts when pulling (fixes #220)		2015-03-30 21:20:23 +01:00
..
auto	Translation update for external versioner	2015-03-30 14:15:17 +02:00
beacon	MPLv2	2015-03-17 16:02:27 +01:00
config	More graceful handling on folder errors (fixes #762)	2015-03-30 08:27:12 +02:00
db	Implement version vectors	2015-03-25 23:10:34 +01:00
discover	Implement version vectors	2015-03-25 23:10:34 +01:00
events	MPLv2	2015-03-17 16:02:27 +01:00
fnmatch	MPLv2	2015-03-17 16:02:27 +01:00
ignore	MPLv2	2015-03-17 16:02:27 +01:00
model	Merge pull request #1540 from calmh/conflicts	2015-03-30 21:20:23 +01:00
osutil	Skip unspecified IPs	2015-03-19 12:44:38 +00:00
scanner	Support multiple scan query strings at the same time	2015-03-28 22:40:13 +01:00
stats	MPLv2	2015-03-17 16:02:27 +01:00
symlinks	MPLv2	2015-03-17 16:02:27 +01:00
upgrade	MPLv2	2015-03-17 16:02:27 +01:00
upnp	MPLv2	2015-03-17 16:02:27 +01:00
versioner	use Lstat instead of Stat to prevent errors with symlinks	2015-03-19 17:36:15 +01:00