Skip to content
Snippets Groups Projects
Commit 1481056a authored by Alec Leamas's avatar Alec Leamas
Browse files

Revert "Merge remote branch 'upstream/master'" 

This reverts commit fb70dc8c, reversing
changes made to 53fef63a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
parent 3faca838
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 99 additions and 382 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment