le premier commit github
le premier déploiment heroku
déploiment heroku
déploiment heroku
explorateur de fichiers et gestion basique des documents. Il pleuvait...
amélioration du module document
déploiment heroku
déploiment heroku
déploiment heroku
ajout de l'admin pour le type de document
Les autorisations pour les documents
Create LISCENCE
Rename LISCENCE to LICENSE
Delete LICENSE
premier commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/admin/dashboard.rb
	app/assets/javascripts/active_admin.js
	app/assets/javascripts/application.js
	app/assets/javascripts/document/documents.js.coffee
	app/assets/javascripts/domains.js.coffee
	app/assets/javascripts/users.js.coffee
	app/assets/stylesheets/application.css
	app/assets/stylesheets/foundation_and_overrides.scss
	app/controllers/application_controller.rb
	app/helpers/document/documents_helper.rb
	app/models/ability.rb
	app/models/c_file/c_file.rb
	app/models/c_file/structure.rb
	app/models/document/document.rb
	app/models/document/study_level.rb
	app/models/document/type.rb
	app/models/domain.rb
	app/models/member/comment.rb
	app/models/member/group/group.rb
	app/models/user.rb
	app/views/layouts/_header.html.erb
	app/views/static_pages/about.html.erb
	app/views/static_pages/home.html.haml
	config/initializers/simple_form.rb
	config/locales/fr/fr.yml
	config/locales/routes.yml
	config/routes.rb
	db/migrate/20130718212719_devise_create_users.rb
	db/migrate/20130728155419_create_document_documents.rb
	db/migrate/20130729170930_addrelations_todocument_documents.rb
	db/schema.rb
	erd.pdf
	public/assets/active_admin.css
	public/assets/active_admin.css.gz
	public/assets/active_admin.js
	public/assets/active_admin.js.gz
	public/assets/active_admin/application-76e6765c9bbc583ee2e0c48bb85c36be.js.gz
	public/assets/active_admin/application.js.gz
	public/assets/active_admin/pages/application-bd3dab48721142894e2983a7c6add54f.js.gz
	public/assets/active_admin/pages/application.js.gz
	public/assets/active_admin/print-e2186aeecceb677443527e791ac876ed.css.gz
	public/assets/active_admin/print.css.gz
	public/assets/application.css
	public/assets/application.css.gz
	public/assets/application.js
	public/assets/application.js.gz
	public/assets/manifest.yml
	public/assets/vendor/custom.modernizr-33ada524d602af3c6bc97b2f5ebae180.js.gz
	public/assets/vendor/custom.modernizr.js.gz
	public/assets/vendor/zepto.js
	public/assets/vendor/zepto.js.gz
	spec/controllers/users_controller_spec.rb
	spec/factories.rb
merge