HomePhabricator

Merge branch 'devel'

Authored by Incola.

Description

Merge branch 'devel'

Conflicts:
public_html/view/js/lavoro_sporco.js

Details

Committed
IncolaJun 16 2014, 8:47 PM
Parents
rTMTG09bf4542f0e8: New legend buttons
rTMTG36edee5d8bae: Add Portale to utils.sh
Branches
Unknown
Tags
Unknown
ChangeId
None

Merged Changes

CommitAuthorDetailsCommitted
09bf4542f0e8Incola
New legend buttons 
Jun 16 2014