Skip to content

Commit

Permalink
final push for acilos beta 9
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed Jul 18, 2014
1 parent c34041c commit 43e52d0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions scripts/build/build
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ rsync -av --exclude .svn $SRCDIR/elasticSearch/ $DISTDIR/elasticSearch/
rsync -av --exclude .svn $SRCDIR/oAuth/ $DISTDIR/oAuth/
rsync -av --exclude .svn $SRCDIR/rest/ $DISTDIR/rest/
rsync -av --exclude .svn $SRCDIR/vendor/ $DISTDIR/vendor/
rsync -av --exclude .svn $SRCDIR/private/ $DISTDIR/private/

# Copy & minify production.html
# sed s/{{APP}}/$APP/g $SRCDIR/$TIER.html | tr -d '\n' > $DISTDIR/index.html
Expand Down
2 changes: 1 addition & 1 deletion src/rest/v1.0/lib/Credentials.php
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ public function getAuthCreds(){
$account = array(
"status" => "unauthorized",
"auth" => $serviceCreds['twitter'][$a]['auth'],
"auth" => $serviceCreds['twitter'][$a]['accounts'][0]['color']
"color" => $serviceCreds['twitter'][$a]['accounts'][0]['color']
);
array_push($returnArr['twitter'], $account);
}
Expand Down

0 comments on commit 43e52d0

Please sign in to comment.