aboutsummaryrefslogtreecommitdiff
path: root/doc/design/assistant/more_cloud_providers.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-21 15:54:47 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-21 15:54:47 -0400
commit14f2a42ca4131a7a51a9e10a94521639b971bccd (patch)
treea76c877c097d190e823868163bb269c7a2afbc9e /doc/design/assistant/more_cloud_providers.mdwn
parent445405a81a435e9f06b7f8fcd74339d853585a20 (diff)
parent27a5b84da481fdf2bc87fc9a9fc7e1080a5a9b09 (diff)
Merge branch 'master' into xmpp
Conflicts: debian/changelog doc/design/assistant/more_cloud_providers.mdwn
Diffstat (limited to 'doc/design/assistant/more_cloud_providers.mdwn')
-rw-r--r--doc/design/assistant/more_cloud_providers.mdwn3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/design/assistant/more_cloud_providers.mdwn b/doc/design/assistant/more_cloud_providers.mdwn
index 52372e06d..16e727657 100644
--- a/doc/design/assistant/more_cloud_providers.mdwn
+++ b/doc/design/assistant/more_cloud_providers.mdwn
@@ -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]].