]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 29 Jan 2015 22:57:13 +0000 (23:57 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 29 Jan 2015 22:57:13 +0000 (23:57 +0100)
commitbc29bb3294979665729b73796df4cb1b89f04703
treea4378880eddfbd09e56edc152bd38ba65c43ecb4
parent107cd07b3ceeafc997c9c72a381e125ac5c99d60
parent998ee28847890f4f905631935027455c3a17048a
Merge branch 'dev' of github.com:Parisson/Telemeta into dev

Conflicts:
telemeta/locale