nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/albums
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
..
_album.html.haml Add or later to license notice 2010-10-07 16:25:34 -07:00
_new_album.haml Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
edit.html.haml small view cleanups 2010-10-17 21:55:03 -07:00
index.html.haml default user picture change. stream link on all aspects page fix. layout view is not fragmented. 2010-10-19 11:29:29 -07:00
show.html.haml default user picture change. stream link on all aspects page fix. layout view is not fragmented. 2010-10-19 11:29:29 -07:00