merge with master.

2 files changed, 10 insertions, 0 deletions

diff --git a/db/migrate/20131229022014_drop_table_activities.rb b/db/migrate/20131229022014_drop_table_activities.rb
new file mode 100644
index 00000000..e0bf13eb
--- /dev/null
+++ b/db/migrate/20131229022014_drop_table_activities.rb
@@ -0,0 +1,5 @@
+class DropTableActivities < ActiveRecord::Migration
+  def change
+    drop_table :activities
+  end
+end
diff --git a/db/migrate/20131230013944_add_image_processing_to_photos.rb b/db/migrate/20131230013944_add_image_processing_to_photos.rb
new file mode 100644
index 00000000..ae4c7766
--- /dev/null
+++ b/db/migrate/20131230013944_add_image_processing_to_photos.rb
@@ -0,0 +1,5 @@
+class AddImageProcessingToPhotos < ActiveRecord::Migration
+  def change
+    add_column :photos, :image_processing, :boolean
+  end
+end