mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into xmpp

Browse source 
Conflicts:
	debian/changelog
	doc/design/assistant/more_cloud_providers.mdwn
This commit is contained in:
Joey Hess 2013-05-21 15:54:47 -04:00
commit 700d5683a9
14 changed files with 97 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

3
doc/design/assistant/more_cloud_providers.mdwn
View file

@ -17,5 +17,8 @@ More should be added, such as:
* Flickr provides 1 tb (!!!!) to free accounts, and can store at least
photos and videos. <https://github.com/ricardobeat/filr> is a hack
to allow storing any type of file on Flickr.
* mega.co.nz. Already supported via [[tips/megaannex]], would just need
webapp modifications to configure it. May want to use megaannex as-is to
build a non-hook special remote in haskell.
See poll at [[polls/prioritizing_special_remotes]].