fixing conflicts [#7]

This commit is contained in:
rgarcia
2015-07-18 18:04:23 +02:00
17 changed files with 202 additions and 6 deletions

View File

@@ -0,0 +1 @@
ActsAsTaggableOn.delimiter = ','