git.parisson.com Git - telecaster-instance.git/commit

]> git.parisson.com Git - telecaster-instance.git/commit

projects / telecaster-instance.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 42ca449 0c89fe4)

author	yomguy <yomguy@parisson.com>
	Thu, 28 Jun 2018 12:17:27 +0000 (14:17 +0200)
committer	yomguy <yomguy@parisson.com>
	Thu, 28 Jun 2018 12:17:27 +0000 (14:17 +0200)
commit	16755ad4bc72c7049d5d22da496ef09c8c9dae99
tree	97cc3596f22cba039c99e5d4413421d426e1ecea	tree \| snapshot
parent	42ca4493c2222fd643d21a7fd12773fcedba7adc	commit \| diff
parent	0c89fe483e22633fcb28a733b579286af945def6	commit \| diff

Merge branch 'dev' of git.parisson.com:git/telecaster-instance into dev

Conflicts:
settings.py

Unnamed repository; edit this file 'description' to name the repository.