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 'v05' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v05
[pettanr/pettanr.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
e4e9cd8
..
f17f516
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-6,9
+6,11
@@
tmp/
Gemfile.lock
.sass-cache/
public/image/*
+public/assets/*
config/aws.yaml
config/picture_io.yml
config/license.yml
+config/profile.json
config/test_layout
lib/test/temp/
db/migrate/*_creative_commons_v??_licenses_attributes.rb