Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.

2014-10-10 19:57:22 +00:00 · 2014-10-10 19:57:22 +00:00 · 9fb35c448e
commit 9fb35c448e
parent 0196aa21f5 081ca0a6a4
24 changed files with 165 additions and 106 deletions
--- a/airtime_mvc/application/views/scripts/form/edit-user.phtml
+++ b/airtime_mvc/application/views/scripts/form/edit-user.phtml
@ -166,6 +166,7 @@
                </ul>
            <?php endif; ?> 
        </dd>
+        <?php echo $this->element->getElement('csrf') ?>
    </dl>
    <button type="submit" id="cu_save_user" class="btn btn-small right-floated"><?php echo _("Save")?></button>
 </form>