Changeset 733baa0

Timestamp:

05/04/12 16:56:03 (13 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, diadems, generic, lam, nlivemulti, release/1.4.4, storage

Children:

f84855f9, ee6af90

Parents:

7d6cfb3 (diff), 84ccc98 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

yomguy <yomguy@…> (05/04/12 16:56:03)

git-committer:

yomguy <yomguy@…> (05/04/12 16:56:03)

Message:

Merge branch 'master' into develop

Files:

• telemeta/static/telemeta/images/view-pim-notes.png (added)
• tools/dev/push.sh (modified) (1 diff)

tools/dev/push.sh

@@ -22 +22 @@
 #echo "Update jimi.parisson.com:"
 echo "Update angus.parisson.com:"
-ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull origin master; \
-                        cd /home/telemeta/telemeta-develop; git pull origin develop; \
+ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull; \
+                        cd /home/telemeta/telemeta-develop; git pull; \
                         cd /home/telemeta/demo/; ./manage.py migrate telemeta --delete-ghost-migrations;
                         cd /home/telemeta/sandbox/; ./manage.py migrate telemeta --delete-ghost-migrations;