mop.ddnsfree.com Git - brisk.git/commit

projects / brisk.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 302c97f 0c03cc5)

author	Matteo Nastasi <nastasi@alternativeoutput.it>
	Sun, 9 Jul 2017 17:02:31 +0000 (19:02 +0200)
committer	Matteo Nastasi <nastasi@alternativeoutput.it>
	Sun, 9 Jul 2017 17:02:31 +0000 (19:02 +0200)
commit	c0cc54c9494acf8f43b92a0517d32d38b5006aa0
tree	bad8bb093112146c886fcee4c27b3cb4bd16ba31	tree \| snapshot
parent	302c97f7ac81dfcc6fc8d8d44359f4f432e4618a	commit \| diff
parent	0c03cc562401d8eae266433472ab26d32fefaf04	commit \| diff

Merge remote-tracking branch 'origin/together-for-fun' into nginx

Conflicts:
web/briskin5/Obj/briskin5.phh
web/briskin5/index_wr.php
web/briskin5/stat-day.php
web/briskin5/statadm.php

INSTALL.sh	diff1 \|	diff2 \|	blob \| history
web/Obj/brisk.phh	diff1 \|	diff2 \|	blob \| history
web/Obj/dbase_pgsql.phh	diff1 \|	diff2 \|	blob \| history
web/Obj/user.phh	diff1 \|	diff2 \|	blob \| history
web/briskin5/Obj/briskin5.phh	diff1 \|	diff2 \|	blob \| history
web/briskin5/index.php	diff1 \|	diff2 \|	blob \| history
web/briskin5/index_wr.php	diff1 \|	diff2 \|	blob \| history
web/index.php	diff1 \|	diff2 \|	blob \| history

Brisk - briscola chiamata in salsa Ajax: sources.