OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v06sheet' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06sheet
[pettanr/pettanr.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
f17f516
..
72fab49
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-10,6
+10,9
@@
public/assets/*
config/aws.yaml
config/picture_io.yml
config/license.yml
config/aws.yaml
config/picture_io.yml
config/license.yml
+config/speech_balloon.yml
+config/writing_format.yml
+config/element.yml
config/profile.json
config/test_layout
lib/test/temp/
config/profile.json
config/test_layout
lib/test/temp/
@@
-19,3
+22,7
@@
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/*_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
+db/migrate/*_speech_balloon_import*.rb