trying to pull
trying to pull
trying to make subscription work
trying again
pull
pulling
fixed merge conflict
trying to paginate
pulled again
fixed merge conflict
pulling styling
styling pulled
Merge branch 'master' of github.com:Eventalist/Eventalist into yoshiemuranaka
pulling styles
styling
Merge pull request #35 from Eventalist/yoshiemuranaka

Yoshiemuranaka