diff options
| author | Teddy Wing | 2012-06-23 23:23:38 -0400 |
|---|---|---|
| committer | Teddy Wing | 2012-06-23 23:23:38 -0400 |
| commit | 83de7a5a08af790bd1b4147e993aebc754e19b25 (patch) | |
| tree | 9495b58509a69046c28abe0859dda5693dbe55d5 /Resources/app.js | |
| parent | 123cbfc4681aa5aa40198673c140f8b051f73c01 (diff) | |
| parent | 87447e04576ab5cf2d87d6f93664b488633ec21c (diff) | |
| download | LikeFeed-83de7a5a08af790bd1b4147e993aebc754e19b25.tar.bz2 | |
Merge branch 'master' of github.com:teddywing/LikeFeed
Conflicts:
Resources/friendship/ui/LikeList.js
Diffstat (limited to 'Resources/app.js')
| -rw-r--r-- | Resources/app.js | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Resources/app.js b/Resources/app.js index fb6d46e..3835b41 100644 --- a/Resources/app.js +++ b/Resources/app.js @@ -1,7 +1,5 @@ Ti.include('/friendship/friendship.js'); -Ti.API.info("Running the app - app.js"); - fs.app.mainTabGroup = fs.ui.createApplicationTabGroup(); // Login switch |