Merge branch 'hotfix/v0.1.0.1'
switch Gemfile.lock to pg exclusivly
testing written change
see if it's modified
test new commit
test new commit2
test in conversation
test in message.rb
i switch the branchhhh
blabla
retour normal
resolution
Merge branch 'production' into heroku
fenetre
fenetre2
fenetre3
change tout
creation fichier text
conflicts solved in gemfile