whatever changes to application.yml
Merge branch 'twitter-setup'
testing gitignore
wip first model view
whatever changes to application.yml
testing gitignore
wip first model view
Merge branch 'master' of github.com:sts10/squawk
whatever changes to application.yml
testing gitignore
wip first model view
merge conflict fix
resolved conflict
more conflict resolution
resolved conlfict"
Merge branch 'master' of github.com:sts10/squawk
remove application.yml