Changeset [b84bf1b69038d672289ad97a4af83b356edb021d] by bborn
June 29th, 2009 @ 08:33 PM
Merge branch 'a5sk4s/edge' into edge
Conflicts:
app/views/shared/_header.html.haml
lib/apis/meta_weblog_service.rb
Committed by bborn
- M app/controllers/comments_controller.rb
- M app/helpers/base_helper.rb
- M app/models/user_notifier.rb
- M app/views/admin/users.html.haml
- M app/views/base/_about_nav.html.haml
- M app/views/base/site_index.html.haml
- M app/views/categories/show.html.haml
- M app/views/friendships/index.xml.builder
- M app/views/layouts/application.html.haml
- M app/views/layouts/beta.html.haml
- M app/views/posts/popular.html.haml
- M app/views/posts/recent.html.haml
- M app/views/shared/_header.html.haml
- M app/views/sitemap/index.xml.builder
- M app/views/user_notifier/follow_up_comment_notice.html.erb
- M app/views/user_notifier/new_forum_post_notice.html.erb
- M app/views/users/forgot_password.html.haml
- M app/views/users/forgot_username.html.haml
- M app/views/users/resend_activation.html.haml
- M config/desert_routes.rb
- M sample_files/sample_themes/dappled/views/shared/_header.html.haml
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »
CommunityEngine is a free, open-source social network plugin for Ruby on Rails applications. Drop it into your new or existing application, and you’ll instantly have all the features of a basic community site.
