979e2ae2ac
Conflicts: lib/tasks/site.rake |
||
---|---|---|
.. | ||
.gitkeep | ||
anc_tasks.rake | ||
build_new_member.rake | ||
confirm_and_approve_users.rake | ||
data_migration.rake | ||
designs.rake | ||
desktop.rake | ||
desktop_update.rake | ||
dev.rake | ||
gallery.rake | ||
index.rake | ||
matt_dev.rake | ||
member_user_id.rake | ||
migrate.rake | ||
mobile_bulletin.rake | ||
new_site.rake | ||
new_ui.rake | ||
resque.rake | ||
site.rake | ||
uploader.rake |