nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/shared
History
Alec Leamas 1481056af2 Revert "Merge remote branch 'upstream/master'" 
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
2010-10-20 14:59:55 +02:00
..
_aspect_friends.haml Fix bug 376 2010-10-19 11:39:52 -07:00
_aspect_nav.haml padding on stream fix. added add aspect button in aspect nav. 2010-10-19 12:10:22 -07:00
_invitations.haml Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
_post_wrapper.haml Add or later to license notice 2010-10-07 16:25:34 -07:00
_public_explain.haml Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
_publisher.haml various. fixed publisher in new layout. 2010-10-18 11:00:52 -07:00
_reshare.haml Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
_sub_header.haml somewhat there 2010-10-18 11:00:52 -07:00
log.haml Add or later to license notice 2010-10-07 16:25:34 -07:00