Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 7d019e6..ddb3c5a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,11 +3,15 @@ db/*.sqlite3
 db/schema.rb
 log/*.log
 tmp/
+Gemfile.lock
 .sass-cache/
 public/image/*
+public/assets/*
 config/aws.yaml
 config/picture_io.yml
 config/license.yml
+config/speech_balloon.yml
+config/profile.json
 config/test_layout
 lib/test/temp/
 db/migrate/*_creative_commons_v??_licenses_attributes.rb
@@ -16,3 +20,6 @@ db/migrate/*_pettan_protected_v??_licenses_attributes.rb
 db/migrate/*_pettan_public_v??_licenses_attributes.rb
 db/migrate/*_public_domain_v??_licenses_attributes.rb
 db/migrate/*_unknown_v??_licenses_attributes.rb
+db/migrate/*_speech_balloon_speech_balloons.rb
+db/migrate/*_speech_balloon_balloons.rb
+db/migrate/*_speech_balloon_speeches.rb