nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/controllers
History
danielvincent 01f048b0a6 Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	public/stylesheets/sass/application.sass
2010-06-28 22:18:47 -07:00
..
application_controller.rb login page 2010-06-28 22:18:05 -07:00
blogs_controller.rb added will pagination action. 2010-06-28 21:56:58 -07:00
bookmarks_controller.rb added will pagination action. 2010-06-28 21:56:58 -07:00
comments_controller.rb commiting so i can pull 2010-06-28 14:47:23 -07:00
dashboard_controller.rb added will pagination action. 2010-06-28 21:56:58 -07:00
friends_controller.rb moved the silly destory link over a bit 2010-06-28 22:15:52 -07:00
status_messages_controller.rb added will pagination action. 2010-06-28 21:56:58 -07:00
users_controller.rb added will pagination action. 2010-06-28 21:56:58 -07:00