Joey Hess d6f65aed16 Merge branch 'master' into assistant ... Conflicts: doc/design/assistant/syncing.mdwn		2012-07-06 18:26:40 -06:00
..
bugs	Added a comment	2012-07-04 12:32:44 +00:00
design	Merge branch 'master' into assistant	2012-07-06 18:26:40 -06:00
encryption
forum	Added a comment	2012-07-06 13:04:07 +00:00
install	Added a comment	2012-07-04 13:14:00 +00:00
news	add news item for git-annex 3.20120629	2012-06-29 14:03:37 -04:00
special_remotes	Added a comment	2012-06-25 15:29:30 +00:00
sync
templates
tips	fixie	2012-06-07 10:37:06 -04:00
todo	response	2012-06-09 17:07:40 -04:00
upgrades	Added a comment: The fact that the keys changed causes merge conflicts	2012-06-25 00:29:02 +00:00
use_case
users
walkthrough	Added a comment	2012-05-27 23:35:19 +00:00
backends.mdwn
bare_repositories.mdwn
bugs.mdwn
comments.mdwn
contact.mdwn
contributing.mdwn	cleanup	2012-06-12 11:35:32 -04:00
copies.mdwn
design.mdwn
distributed_version_control.mdwn
download.mdwn	doc/download.mdwn: document no-s3 and assistant branches	2012-06-30 15:00:00 +02:00
encryption.mdwn
favicon.ico
feeds.mdwn
forum.mdwn
future_proofing.mdwn
git-annex-shell.mdwn	add fields to git-annex-shell	2012-07-02 00:53:00 -04:00
git-annex.mdwn	Merge branch 'master' into assistant	2012-06-27 16:14:33 -04:00
git-union-merge.mdwn
GPL
how_it_works.mdwn
index.mdwn
install.mdwn	Version build dependency on STM, and allow building without it, which disables the watch command.	2012-06-26 09:15:47 -04:00
internals.mdwn
location_tracking.mdwn
logo.png
logo_small.png
meta.mdwn
news.mdwn
not.mdwn
repomap.png
scalability.mdwn
sitemap.mdwn
special_remotes.mdwn
summary.mdwn
sync.mdwn
testimonials.mdwn	add a nice one	2012-05-31 21:31:25 -04:00
tips.mdwn
todo.mdwn
transferring_data.mdwn
trust.mdwn
upgrades.mdwn
users.mdwn
walkthrough.mdwn	add trail	2012-05-27 16:56:20 -04:00