• Romain Therville's avatar
    Merge branch 'master' into 'issue#120' · 3f190de0
    Romain Therville authored
    # Conflicts:
    #   ui/nG6/pi6/class.tx_nG6_pi6.php
    The conflict only concerned php comments. I would have prefered to remove them, but the resulting script seemed really fishy on the git file compare display.
    Anyway, we'll be able to remove those comments later.
class.tx_nG6_pi1.php 24.8 KB