nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/aspects
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
..
_new_aspect.haml Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
_no_friends_message.haml fixed no friends/posts message positioning 2010-10-19 12:28:54 -07:00
_no_posts_message.haml fixed no friends/posts message positioning 2010-10-19 12:28:54 -07:00
index.html.haml fixed no friends/posts message positioning 2010-10-19 12:28:54 -07:00
manage.html.haml padding on stream fix. added add aspect button in aspect nav. 2010-10-19 12:10:22 -07:00
show.html.haml fixed no friends/posts message positioning 2010-10-19 12:28:54 -07:00